Merge branch 'master' of github.com:NixOS/nixpkgs

2015-12-13 11:22:27 +01:00 · 2015-12-13 11:22:27 +01:00 · a7f91d751b
commit a7f91d751b
parent 116c230e82 54e0a9b7ac
335 changed files with 13616 additions and 3890 deletions
--- a/doc/configuration.xml
+++ b/doc/configuration.xml
@ -0,0 +1,109 @@
+<chapter xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xml:id="chap-packageconfig">
+
+<title><filename>~/.nixpkgs/config.nix</filename>: global configuration</title>
+
+<para>Nix packages can be configured to allow or deny certain options.</para>
+
+<para>To apply the configuration edit
+<filename>~/.nixpkgs/config.nix</filename> and set it like
+
+<programlisting>
+{
+  allowUnfree = true;
+}
+</programlisting>
+
+and will allow the Nix package manager to install unfree licensed packages.</para>
+
+<para>The configuration as listed also applies to NixOS under
+<option>nixpkgs.config</option> set.</para>
+
+<itemizedlist>
+
+  <listitem>
+    <para>Allow installing of packages that are distributed under
+    unfree license by setting <programlisting>allowUnfree =
+    true;</programlisting> or deny them by setting it to
+    <literal>false</literal>.</para>
+
+    <para>Same can be achieved by setting the environment variable:
+
+<programlisting>
+$ export NIXPKGS_ALLOW_UNFREE=1
+</programlisting>
+
+    </para>
+  </listitem>
+
+  <listitem>
+    <para>Whenever unfree packages are not allowed, single packages
+    can still be allowed by a predicate function that accepts package
+    as an argument and should return a boolean:
+
+<programlisting>
+allowUnfreePredicate = (pkg: ...);
+</programlisting>
+
+    Example to allow flash player only:
+
+<programlisting>
+allowUnfreePredicate = (pkg: pkgs.lib.hasPrefix "flashplayer-" pkg.name);
+</programlisting>
+
+    </para>
+  </listitem>
+
+  <listitem>
+    <para>Whenever unfree packages are not allowed, packages can still
+    be whitelisted by their license:
+
+<programlisting>
+whitelistedLicenses = with stdenv.lib.licenses; [ amd wtfpl ];
+</programlisting>
+    </para>
+  </listitem>
+
+  <listitem>
+    <para>In addition to whitelisting licenses which are denied by the
+    <literal>allowUnfree</literal> setting, you can also explicitely
+    deny installation of packages which have a certain license:
+
+<programlisting>
+blacklistedLicenses = with stdenv.lib.licenses; [ agpl3 gpl3 ];
+</programlisting>
+    </para>
+  </listitem>
+
+</itemizedlist>
+
+<para>A complete list of licenses can be found in the file
+<filename>lib/licenses.nix</filename> of the nix package tree.</para>
+
+
+<!--============================================================-->
+
+<section xml:id="sec-modify-via-packageOverrides"><title>Modify
+packages via <literal>packageOverrides</literal></title>
+
+<para>You can define a function called
+<varname>packageOverrides</varname> in your local
+<filename>~/.nixpkgs/config</filename> to overide nix packages.  It
+must be a function that takes pkgs as an argument and return modified
+set of packages.
+
+<programlisting>
+{
+  packageOverrides = pkgs: rec {
+    foo = pkgs.foo.override { ... };
+  };
+}
+</programlisting>
+
+</para>
+
+</section>
+
+
+</chapter>
--- a/doc/language-support.xml
+++ b/doc/language-support.xml
@ -1,4 +1,3 @@
-
 <chapter xmlns="http://docbook.org/ns/docbook"
         xmlns:xlink="http://www.w3.org/1999/xlink"
         xml:id="chap-language-support">
--- a/doc/packageconfig.xml
+++ b/doc/packageconfig.xml
@ -1,88 +0,0 @@
-<chapter xmlns="http://docbook.org/ns/docbook"
-	 xmlns:xlink="http://www.w3.org/1999/xlink"
-	 xml:id="chap-packageconfig">
-
-<title><filename>~/.nixpkgs/config.nix</filename>: global configuration</title>
-
-    <para>
-      Nix packages can be configured to allow or deny certain options.
-    </para>
-
-    <para>
-	To apply the configuration edit <filename>~/.nixpkgs/config.nix</filename>
-	and set it like
-<programlisting>{
-  allowUnfree = true;
-}</programlisting>
-	and will allow the Nix package manager to install unfree licensed packages.
-
-	The configuration as listed also applies to NixOS under <option>nixpkgs.config</option> set.
-    </para>
-
-    <itemizedlist>
-	<listitem>
-	    <para>
-		Allow installing of packages that are distributed under unfree license by setting
-		<programlisting>allowUnfree = true;</programlisting>
-		or deny them by setting it to <literal>false</literal>.
-	    </para>
-	    <para>
-		Same can be achieved by setting the environment variable:
-		<programlisting>$ export NIXPKGS_ALLOW_UNFREE=1</programlisting>
-	    </para>
-	</listitem>
-
-	<listitem>
-	    <para>
-		Whenever unfree packages are not allowed, single packages can
-		still be allowed by a predicate function that accepts package
-		as an argument and should return a boolean:
-		<programlisting>allowUnfreePredicate = (pkg: ...);</programlisting>
-
-		Example to allow flash player only:
-		<programlisting>allowUnfreePredicate = (pkg: pkgs.lib.hasPrefix "flashplayer-" pkg.name);</programlisting>
-	    </para>
-	</listitem>
-
-	<listitem>
-	    <para>
-		Whenever unfree packages are not allowed, packages can still be
-		whitelisted by their license:
-		<programlisting>whitelistedLicenses = with stdenv.lib.licenses; [ amd wtfpl ];</programlisting>
-	    </para>
-	</listitem>
-
-	<listitem>
-	    <para>
-		In addition to whitelisting licenses which are denied by the
-		<literal>allowUnfree</literal> setting, you can also explicitely
-		deny installation of packages which have a certain license:
-		<programlisting>blacklistedLicenses = with stdenv.lib.licenses; [ agpl3 gpl3 ];</programlisting>
-	    </para>
-	</listitem>
-    </itemizedlist>
-
-    <para>
-	A complete list of licenses can be found in the file
-	<filename>lib/licenses.nix</filename> of the nix package tree.
-    </para>
-
-<section xml:id="sec-modify-via-packageOverrides"><title>Modify
-packages via <literal>packageOverrides</literal></title>
-
-<para>
-
-  You can define a function called <varname>packageOverrides</varname>
-  in your local <filename>~/.nixpkgs/config</filename> to overide nix
-  packages.  It must be a function that takes pkgs as an argument and
-  return modified set of packages.
-
-  <programlisting>{
-  packageOverrides = pkgs: rec {
-    foo = pkgs.foo.override { ... };
-  };
-}</programlisting>
-</para>
-</section>
-
-</chapter>
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@ -93,7 +93,6 @@
  elasticdog = "Aaron Bull Schaefer <aaron@elasticdog.com>";
  ellis = "Ellis Whitehead <nixos@ellisw.net>";
  ehmry = "Emery Hemingway <emery@vfemail.net>";
-  enolan = "Echo Nolan <echo@echonolan.net>";
  epitrochoid = "Mabry Cervin <mpcervin@uncg.edu>";
  ericbmerritt = "Eric Merritt <eric@afiniate.com>";
  ericsagnes = "Eric Sagnes <eric.sagnes@gmail.com>";
@ -182,7 +181,7 @@
  malyn = "Michael Alyn Miller <malyn@strangeGizmo.com>";
  manveru = "Michael Fellinger <m.fellinger@gmail.com>";
  marcweber = "Marc Weber <marco-oweber@gmx.de>";
-  markWot = "Markus Wotringer <markus@wotringer.de";
+  markWot = "Markus Wotringer <markus@wotringer.de>";
  maurer = "Matthew Maurer <matthew.r.maurer+nix@gmail.com>";
  matejc = "Matej Cotman <cotman.matej@gmail.com>";
  mathnerd314 = "Mathnerd314 <mathnerd314.gph+hs@gmail.com>";
--- a/lib/strings.nix
+++ b/lib/strings.nix
@ -52,6 +52,10 @@ rec {
  # libraries for a set of packages, e.g. "${pkg1}/lib:${pkg2}/lib:...".
  makeLibraryPath = makeSearchPath "lib";

+  # Construct a binary search path (such as $PATH) containing the
+  # binaries for a set of packages, e.g. "${pkg1}/bin:${pkg2}/bin:...".
+  makeBinPath = makeSearchPath "bin";
+

  # Idem for Perl search paths.
  makePerlPath = makeSearchPath "lib/perl5/site_perl";
--- a/maintainers/scripts/copy-tarballs.pl
+++ b/maintainers/scripts/copy-tarballs.pl
@ -1,97 +1,142 @@
-#! /run/current-system/sw/bin/perl -w
+#! /usr/bin/env nix-shell
+#! nix-shell -i perl -p perl perlPackages.NetAmazonS3 nixUnstable
+
+# This command uploads tarballs to tarballs.nixos.org, the
+# content-addressed cache used by fetchurl as a fallback for when
+# upstream tarballs disappear or change. Usage:
+#
+# 1) To upload a single file:
+#
+#    $ copy-tarballs.pl --file /path/to/tarball.tar.gz
+#
+# 2) To upload all files obtained via calls to fetchurl in a Nix derivation:
+#
+#    $ copy-tarballs.pl --expr '(import <nixpkgs> {}).hello'

 use strict;
-use XML::Simple;
+use warnings;
 use File::Basename;
 use File::Path;
-use File::Copy 'cp';
-use IPC::Open2;
+use JSON;
+use Net::Amazon::S3;
 use Nix::Store;

-my $myDir = dirname($0);
+# S3 setup.
+my $aws_access_key_id = $ENV{'AWS_ACCESS_KEY_ID'} or die;
+my $aws_secret_access_key = $ENV{'AWS_SECRET_ACCESS_KEY'} or die;

-my $tarballsCache = $ENV{'NIX_TARBALLS_CACHE'} // "/tarballs";
+my $s3 = Net::Amazon::S3->new(
+    { aws_access_key_id     => $aws_access_key_id,
+      aws_secret_access_key => $aws_secret_access_key,
+      retry                 => 1,
+    });

-my $xml = `nix-instantiate --eval-only --xml --strict '<nixpkgs/maintainers/scripts/find-tarballs.nix>'`;
-die "$0: evaluation failed\n" if $? != 0;
+my $bucket = $s3->bucket("nixpkgs-tarballs") or die;

-my $data = XMLin($xml) or die;
-
-mkpath($tarballsCache);
-mkpath("$tarballsCache/md5");
-mkpath("$tarballsCache/sha1");
-mkpath("$tarballsCache/sha256");
-
-foreach my $file (@{$data->{list}->{attrs}}) {
-    my $url = $file->{attr}->{url}->{string}->{value};
-    my $algo = $file->{attr}->{type}->{string}->{value};
-    my $hash = $file->{attr}->{hash}->{string}->{value};
-
-    if ($url !~ /^http:/ && $url !~ /^https:/ && $url !~ /^ftp:/ && $url !~ /^mirror:/) {
-        print STDERR "skipping $url (unsupported scheme)\n";
-        next;
-    }
-
-    $url =~ /([^\/]+)$/;
-    my $fn = $1;
-
-    if (!defined $fn) {
-        print STDERR "skipping $url (no file name)\n";
-        next;
-    }
-
-    if ($fn =~ /[&?=%]/ || $fn =~ /^\./) {
-        print STDERR "skipping $url (bad character in file name)\n";
-        next;
-    }
-
-    if ($fn !~ /[a-zA-Z]/) {
-        print STDERR "skipping $url (no letter in file name)\n";
-        next;
-    }
-
-    if ($fn !~ /[0-9]/) {
-        print STDERR "skipping $url (no digit in file name)\n";
-        next;
-    }
-
-    if ($fn !~ /[-_\.]/) {
-        print STDERR "skipping $url (no dash/dot/underscore in file name)\n";
-        next;
-    }
-
-    my $dstPath = "$tarballsCache/$fn";
-
-    next if -e $dstPath;
-
-    print "downloading $url to $dstPath...\n";
-
-    next if $ENV{DRY_RUN};
-
-    $ENV{QUIET} = 1;
-    $ENV{PRINT_PATH} = 1;
-    my $fh;
-    my $pid = open($fh, "-|", "nix-prefetch-url", "--type", $algo, $url, $hash) or die;
-    waitpid($pid, 0) or die;
-    if ($? != 0) {
-        print STDERR "failed to fetch $url: $?\n";
-        next;
-    }
-    <$fh>; my $storePath = <$fh>; chomp $storePath;
-
-    die unless -e $storePath;
-
-    cp($storePath, $dstPath) or die;
-
-    my $md5 = hashFile("md5", 0, $storePath) or die;
-    symlink("../$fn", "$tarballsCache/md5/$md5");
-
-    my $sha1 = hashFile("sha1", 0, $storePath) or die;
-    symlink("../$fn", "$tarballsCache/sha1/$sha1");
-
-    my $sha256 = hashFile("sha256", 0, $storePath) or die;
-    symlink("../$fn", "$tarballsCache/sha256/$sha256");
-
-    $sha256 = hashFile("sha256", 1, $storePath) or die;
-    symlink("../$fn", "$tarballsCache/sha256/$sha256");
+sub alreadyMirrored {
+    my ($algo, $hash) = @_;
+    return defined $bucket->get_key("$algo/$hash");
+}
+
+sub uploadFile {
+    my ($fn, $name) = @_;
+
+    my $md5_16 = hashFile("md5", 0, $fn) or die;
+    my $sha1_16 = hashFile("sha1", 0, $fn) or die;
+    my $sha256_32 = hashFile("sha256", 1, $fn) or die;
+    my $sha256_16 = hashFile("sha256", 0, $fn) or die;
+    my $sha512_32 = hashFile("sha512", 1, $fn) or die;
+    my $sha512_16 = hashFile("sha512", 0, $fn) or die;
+
+    my $mainKey = "sha512/$sha512_16";
+
+    # Upload the file as sha512/<hash-in-base-16>.
+    print STDERR "uploading $fn to $mainKey...\n";
+    $bucket->add_key_filename($mainKey, $fn, { 'x-amz-meta-original-name' => $name })
+        or die "failed to upload $fn to $mainKey\n";
+
+    # Create redirects from the other hash types.
+    sub redirect {
+        my ($name, $dest) = @_;
+        #print STDERR "linking $name to $dest...\n";
+        $bucket->add_key($name, "", { 'x-amz-website-redirect-location' => "/" . $dest })
+            or die "failed to create redirect from $name to $dest\n";
+    }
+    redirect "md5/$md5_16", $mainKey;
+    redirect "sha1/$sha1_16", $mainKey;
+    redirect "sha256/$sha256_32", $mainKey;
+    redirect "sha256/$sha256_16", $mainKey;
+    redirect "sha512/$sha512_32", $mainKey;
+}
+
+my $op = $ARGV[0] // "";
+
+if ($op eq "--file") {
+    my $fn = $ARGV[1] // die "$0: --file requires a file name\n";
+    if (alreadyMirrored("sha512", hashFile("sha512", 0, $fn))) {
+        print STDERR "$fn is already mirrored\n";
+    } else {
+        uploadFile($fn, basename $fn);
+    }
+}
+
+elsif ($op eq "--expr") {
+
+    # Evaluate find-tarballs.nix.
+    my $expr = $ARGV[1] // die "$0: --expr requires a Nix expression\n";
+    my $pid = open(JSON, "-|", "nix-instantiate", "--eval-only", "--json", "--strict",
+                   "<nixpkgs/maintainers/scripts/find-tarballs.nix>",
+                   "--arg", "expr", $expr);
+    my $stdout = <JSON>;
+    waitpid($pid, 0);
+    die "$0: evaluation failed\n" if $?;
+    close JSON;
+
+    my $fetches = decode_json($stdout);
+
+    print STDERR "evaluation returned ", scalar(@{$fetches}), " tarballs\n";
+
+    # Check every fetchurl call discovered by find-tarballs.nix.
+    my $mirrored = 0;
+    my $have = 0;
+    foreach my $fetch (@{$fetches}) {
+        my $url = $fetch->{url};
+        my $algo = $fetch->{type};
+        my $hash = $fetch->{hash};
+
+        if ($url !~ /^http:/ && $url !~ /^https:/ && $url !~ /^ftp:/ && $url !~ /^mirror:/) {
+            print STDERR "skipping $url (unsupported scheme)\n";
+            next;
+        }
+
+        if (alreadyMirrored($algo, $hash)) {
+            $have++;
+            next;
+        }
+
+        print STDERR "mirroring $url...\n";
+
+        next if $ENV{DRY_RUN};
+
+        # Download the file using nix-prefetch-url.
+        $ENV{QUIET} = 1;
+        $ENV{PRINT_PATH} = 1;
+        my $fh;
+        my $pid = open($fh, "-|", "nix-prefetch-url", "--type", $algo, $url, $hash) or die;
+        waitpid($pid, 0) or die;
+        if ($? != 0) {
+            print STDERR "failed to fetch $url: $?\n";
+            next;
+        }
+        <$fh>; my $storePath = <$fh>; chomp $storePath;
+
+        uploadFile($storePath, $url);
+        $mirrored++;
+    }
+
+    print STDERR "mirrored $mirrored files, already have $have files\n";
+}
+
+else {
+    die "Syntax: $0 --file FILENAME | --expr EXPR\n";
 }
--- a/maintainers/scripts/find-tarballs.nix
+++ b/maintainers/scripts/find-tarballs.nix
@ -4,9 +4,11 @@
 with import ../.. { };
 with lib;

+{ expr ? removeAttrs (import ../../pkgs/top-level/release.nix { }) [ "tarball" "unstable" ] }:
+
 let

-  root = removeAttrs (import ../../pkgs/top-level/release.nix { }) [ "tarball" "unstable" ];
+  root = expr;

  uniqueUrls = map (x: x.file) (genericClosure {
    startSet = map (file: { key = file.url; inherit file; }) urls;
@ -15,7 +17,10 @@ let

  urls = map (drv: { url = head drv.urls; hash = drv.outputHash; type = drv.outputHashAlgo; }) fetchurlDependencies;

-  fetchurlDependencies = filter (drv: drv.outputHash or "" != "" && drv ? urls) dependencies;
+  fetchurlDependencies =
+    filter
+      (drv: drv.outputHash or "" != "" && drv.outputHashMode == "flat" && drv.postFetch or "" == "" && drv ? urls)
+      dependencies;

  dependencies = map (x: x.value) (genericClosure {
    startSet = map keyDrv (derivationsIn' root);
--- a/maintainers/scripts/vanity.sh
+++ b/maintainers/scripts/vanity.sh
@ -12,7 +12,7 @@ git_data="$(echo "$raw_git_log" | grep 'Author:' |
 # Also there are a few manual entries
 maintainers="$(cat "$(dirname "$0")/../../lib/maintainers.nix" |
  grep '=' | sed -re 's/\\"/''/g;
-  s/ *([^ =]*) *= *" *(.*[^ ]) *[<](.*)[>] *".*/\1\t\2\t\3/')"
+  s/[ 	]*([^ 	=]*)[ 	]*=[ 	]*" *(.*[^ ]) *[<](.*)[>] *".*/\1\t\2\t\3/')"
 git_lines="$( ( echo "$git_data";
    cat "$(dirname "$0")/vanity-manual-equalities.txt") | sort |uniq)"

--- a/nixos/doc/manual/release-notes/rl-unstable.xml
+++ b/nixos/doc/manual/release-notes/rl-unstable.xml
@ -104,6 +104,15 @@ nginx.override {
    You can (still) use the <literal>html-tidy</literal> package, which got updated
    to a stable release from this new upstream.</para>
  </listitem>
+
+  <listitem>
+    <para><literal>extraDeviceOptions</literal> argument is removed
+    from <literal>bumblebee</literal> package. Instead there are
+    now two separate arguments: <literal>extraNvidiaDeviceOptions</literal>
+    and <literal>extraNouveauDeviceOptions</literal> for setting
+    extra X11 options for nvidia and nouveau drivers, respectively.
+    </para>
+  </listitem>
 </itemizedlist>

 </section>
--- a/nixos/modules/config/networking.nix
+++ b/nixos/modules/config/networking.nix
@ -96,6 +96,15 @@ in
        example = "http://127.0.0.1:3128";
      };

+      allProxy = lib.mkOption {
+        type = types.nullOr types.str;
+        default = cfg.proxy.default;
+        description = ''
+          This option specifies the all_proxy environment variable.
+        '';
+        example = "http://127.0.0.1:3128";
+      };
+
      noProxy = lib.mkOption {
        type = types.nullOr types.str;
        default = null;
@ -183,6 +192,8 @@ in
          rsync_proxy = cfg.proxy.rsyncProxy;
        } // optionalAttrs (cfg.proxy.ftpProxy != null) {
          ftp_proxy   = cfg.proxy.ftpProxy;
+        } // optionalAttrs (cfg.proxy.allProxy != null) {
+          all_proxy   = cfg.proxy.allProxy;
        } // optionalAttrs (cfg.proxy.noProxy != null) {
          no_proxy    = cfg.proxy.noProxy;
        };
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@ -312,6 +312,7 @@
  ./services/networking/lambdabot.nix
  ./services/networking/mailpile.nix
  ./services/networking/minidlna.nix
+  ./services/networking/miniupnpd.nix
  ./services/networking/mstpd.nix
  ./services/networking/murmur.nix
  ./services/networking/namecoind.nix
@ -342,6 +343,7 @@
  ./services/networking/searx.nix
  ./services/networking/seeks.nix
  ./services/networking/skydns.nix
+  ./services/networking/shairport-sync.nix
  ./services/networking/shout.nix
  ./services/networking/softether.nix
  ./services/networking/spiped.nix
@ -507,6 +509,7 @@
  ./virtualisation/amazon-options.nix
  ./virtualisation/openvswitch.nix
  ./virtualisation/parallels-guest.nix
+  ./virtualisation/rkt.nix
  ./virtualisation/virtualbox-guest.nix
  ./virtualisation/virtualbox-host.nix
  ./virtualisation/vmware-guest.nix
--- a/nixos/modules/services/amqp/rabbitmq.nix
+++ b/nixos/modules/services/amqp/rabbitmq.nix
@ -65,7 +65,7 @@ in {
        type = types.str;
        description = ''
          Verbatim configuration file contents.
-          See http://www.rabbitmq.com/configure.htm
+          See http://www.rabbitmq.com/configure.html
        '';
      };

--- a/nixos/modules/services/misc/redmine.nix
+++ b/nixos/modules/services/misc/redmine.nix
@ -124,7 +124,7 @@ in {

    assertions = [
      { assertion = cfg.databasePassword != "";
-        message = "databasePassword must be set";
+        message = "services.redmine.databasePassword must be set";
      }
    ];

--- a/nixos/modules/services/networking/ddclient.nix
+++ b/nixos/modules/services/networking/ddclient.nix
@ -18,7 +18,7 @@ let
    password=${config.services.ddclient.password}
    protocol=${config.services.ddclient.protocol}
    server=${config.services.ddclient.server}
-    ssl=${if config.services.ddclient.ssl then "yes" else "yes"}
+    ssl=${if config.services.ddclient.ssl then "yes" else "no"}
    wildcard=YES
    ${config.services.ddclient.domain}
    ${config.services.ddclient.extraConfig}
--- a/nixos/modules/services/networking/miniupnpd.nix
+++ b/nixos/modules/services/networking/miniupnpd.nix
@ -0,0 +1,70 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.miniupnpd;
+  configFile = pkgs.writeText "miniupnpd.conf" ''
+    ext_ifname=${cfg.externalInterface}
+    enable_natpmp=${if cfg.natpmp then "yes" else "no"}
+    enable_upnp=${if cfg.upnp then "yes" else "no"}
+
+    ${concatMapStrings (range: ''
+      listening_ip=${range}
+    '') cfg.internalIPs}
+
+    ${cfg.appendConfig}
+  '';
+in
+{
+  options = {
+    services.miniupnpd = {
+      enable = mkEnableOption "MiniUPnP daemon";
+
+      externalInterface = mkOption {
+        type = types.str;
+        description = ''
+          Name of the external interface.
+        '';
+      };
+
+      internalIPs = mkOption {
+        type = types.listOf types.str;
+        example = [ "192.168.1.0/24" ];
+        description = ''
+          The IP address ranges to listen on.
+        '';
+      };
+
+      natpmp = mkEnableOption "NAT-PMP support";
+
+      upnp = mkOption {
+        default = true;
+        type = types.bool;
+        description = ''
+          Whether to enable UPNP support.
+        '';
+      };
+
+      appendConfig = mkOption {
+        type = types.lines;
+        default = "";
+        description = ''
+          Configuration lines appended to the MiniUPnP config.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    systemd.services.miniupnpd = {
+      description = "MiniUPnP daemon";
+      after = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+      path = [ pkgs.miniupnpd ];
+      serviceConfig = {
+        ExecStart = "${pkgs.miniupnpd}/bin/miniupnpd -d -f ${configFile}";
+      };
+    };
+  };
+}
--- a/nixos/modules/services/networking/shairport-sync.nix
+++ b/nixos/modules/services/networking/shairport-sync.nix
@ -0,0 +1,80 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.shairport-sync;
+
+in
+
+{
+
+  ###### interface
+
+  options = {
+
+    services.shairport-sync = {
+
+      enable = mkOption {
+        default = false;
+        description = ''
+          Enable the shairport-sync daemon.
+
+          Running with a local system-wide or remote pulseaudio server
+          is recommended.
+        '';
+      };
+
+      arguments = mkOption {
+        default = "-v -o pulse";
+        description = ''
+          Arguments to pass to the daemon. Defaults to a local pulseaudio
+          server.
+        '';
+      };
+
+      user = mkOption {
+        default = "shairport";
+        description = ''
+          User account name under which to run shairport-sync. The account
+          will be created.
+        '';
+      };
+
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf config.services.shairport-sync.enable {
+
+    services.avahi.enable = true;
+
+    users.extraUsers = singleton
+      { name = cfg.user;
+        description = "Shairport user";
+        isSystemUser = true;
+        createHome = true;
+        home = "/var/lib/shairport-sync";
+        extraGroups = [ "audio" ] ++ optional config.hardware.pulseaudio.enable "pulse";
+      };
+
+    systemd.services.shairport-sync =
+      {
+        description = "shairport-sync";
+        after = [ "network.target" "avahi-daemon.service" ];
+        wantedBy = [ "multi-user.target" ];
+        serviceConfig = {
+          User = cfg.user;
+          ExecStart = "${pkgs.shairport-sync}/bin/shairport-sync ${cfg.arguments}";
+        };
+      };
+
+    environment.systemPackages = [ pkgs.shairport-sync ];
+
+  };
+
+}
--- a/nixos/modules/services/torrent/transmission.nix
+++ b/nixos/modules/services/torrent/transmission.nix
@ -113,21 +113,26 @@ in
          #include <abstractions/base>
          #include <abstractions/nameservice>

-          ${pkgs.glibc}/lib/*.so               mr,
-          ${pkgs.libevent}/lib/libevent*.so*   mr,
-          ${pkgs.curl}/lib/libcurl*.so*        mr,
-          ${pkgs.openssl}/lib/libssl*.so*      mr,
-          ${pkgs.openssl}/lib/libcrypto*.so*   mr,
-          ${pkgs.zlib}/lib/libz*.so*           mr,
-          ${pkgs.libssh2}/lib/libssh2*.so*     mr,
-          ${pkgs.systemd}/lib/libsystemd*.so*  mr,
-          ${pkgs.xz}/lib/liblzma*.so*          mr,
-          ${pkgs.libgcrypt}/lib/libgcrypt*.so* mr,
+          ${pkgs.glibc}/lib/*.so                    mr,
+          ${pkgs.libevent}/lib/libevent*.so*        mr,
+          ${pkgs.curl}/lib/libcurl*.so*             mr,
+          ${pkgs.openssl}/lib/libssl*.so*           mr,
+          ${pkgs.openssl}/lib/libcrypto*.so*        mr,
+          ${pkgs.zlib}/lib/libz*.so*                mr,
+          ${pkgs.libssh2}/lib/libssh2*.so*          mr,
+          ${pkgs.systemd}/lib/libsystemd*.so*       mr,
+          ${pkgs.xz}/lib/liblzma*.so*               mr,
+          ${pkgs.libgcrypt}/lib/libgcrypt*.so*      mr,
          ${pkgs.libgpgerror}/lib/libgpg-error*.so* mr,
+          ${pkgs.libnghttp2}/lib/libnghttp2*.so*    mr,
+          ${pkgs.c-ares}/lib/libcares*.so*          mr,
+          ${pkgs.libcap}/lib/libcap*.so*            mr,
+          ${pkgs.attr}/lib/libattr*.so*             mr,

          @{PROC}/sys/kernel/random/uuid   r,
          @{PROC}/sys/vm/overcommit_memory r,

+          ${pkgs.openssl}/etc/**                     r,
          ${pkgs.transmission}/share/transmission/** r,

          owner ${settingsDir}/** rw,
--- a/nixos/modules/services/x11/desktop-managers/kde5.nix
+++ b/nixos/modules/services/x11/desktop-managers/kde5.nix
@ -108,16 +108,26 @@ in
        kdeApps.okular
        kdeApps.print-manager

+        # Oxygen icons moved to KDE Frameworks 5.16 and later.
        (kdeApps.oxygen-icons or kf5.oxygen-icons5)
        pkgs.hicolor_icon_theme

        plasma5.kde-gtk-config
-        pkgs.orion # GTK theme, nearly identical to Breeze
      ]
+
+      # Plasma 5.5 and later has a Breeze GTK theme.
+      # If it is not available, Orion is very similar to Breeze.
+      ++ lib.optional (!(lib.hasAttr "breeze-gtk" plasma5)) pkgs.orion
+
+      # Install Breeze icons if available
+      ++ lib.optional (lib.hasAttr "breeze-icons" kf5) kf5.breeze-icons
+
+      # Optional hardware support features
      ++ lib.optional config.hardware.bluetooth.enable plasma5.bluedevil
      ++ lib.optional config.networking.networkmanager.enable plasma5.plasma-nm
      ++ lib.optional config.hardware.pulseaudio.enable plasma5.plasma-pa
      ++ lib.optional config.powerManagement.enable plasma5.powerdevil
+
      ++ lib.optionals cfg.phonon.gstreamer.enable
        [
          pkgs.phonon_backend_gstreamer
@ -135,6 +145,7 @@ in
          pkgs.gst_all_1.gst-plugins-bad
          pkgs.gst_all_1.gst-libav # for mp3 playback
        ]
+
      ++ lib.optionals cfg.phonon.vlc.enable
        [
          pkgs.phonon_qt5_backend_vlc
@ -155,6 +166,11 @@ in
        GST_PLUGIN_SYSTEM_PATH_1_0 = [ "/lib/gstreamer-1.0" ];
      };

+    # Enable GTK applications to load SVG icons
+    environment.variables = mkIf (lib.hasAttr "breeze-icons" kf5) {
+      GDK_PIXBUF_MODULE_FILE = "${pkgs.librsvg}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache";
+    };
+
    fonts.fonts = [ (plasma5.oxygen-fonts or pkgs.noto-fonts) ];

    programs.ssh.askPassword = "${plasma5.ksshaskpass}/bin/ksshaskpass";
@ -166,6 +182,14 @@ in
    # Extra UDEV rules used by Solid
    services.udev.packages = [ pkgs.media-player-info ];

+    services.xserver.displayManager.sddm = {
+      theme = "breeze";
+      themes = [
+        plasma5.plasma-workspace
+        (kdeApps.oxygen-icons or kf5.oxygen-icons5)
+      ];
+    };
+
    security.pam.services.kde = { allowNullPassword = true; };

  };
--- a/nixos/modules/services/x11/display-managers/sddm.nix
+++ b/nixos/modules/services/x11/display-managers/sddm.nix
@ -9,12 +9,24 @@ let
  cfg = dmcfg.sddm;
  xEnv = config.systemd.services."display-manager".environment;

+  sddm = pkgs.sddm.override { inherit (cfg) themes; };
+
  xserverWrapper = pkgs.writeScript "xserver-wrapper" ''
    #!/bin/sh
    ${concatMapStrings (n: "export ${n}=\"${getAttr n xEnv}\"\n") (attrNames xEnv)}
    exec ${dmcfg.xserverBin} ${dmcfg.xserverArgs} "$@"
  '';

+  Xsetup = pkgs.writeScript "Xsetup" ''
+    #!/bin/sh
+    ${cfg.setupScript}
+  '';
+
+  Xstop = pkgs.writeScript "Xstop" ''
+    #!/bin/sh
+    ${cfg.stopScript}
+  '';
+
  cfgFile = pkgs.writeText "sddm.conf" ''
    [General]
    HaltCommand=${pkgs.systemd}/bin/systemctl poweroff
@ -22,6 +34,8 @@ let

    [Theme]
    Current=${cfg.theme}
+    ThemeDir=${sddm}/share/sddm/themes
+    FacesDir=${sddm}/share/sddm/faces

    [Users]
    MaximumUid=${toString config.ids.uids.nixbld}
@ -35,6 +49,8 @@ let
    SessionCommand=${dmcfg.session.script}
    SessionDir=${dmcfg.session.desktops}
    XauthPath=${pkgs.xorg.xauth}/bin/xauth
+    DisplayCommand=${Xsetup}
+    DisplayStopCommand=${Xstop}

    ${optionalString cfg.autoLogin.enable ''
    [Autologin]
@ -86,6 +102,35 @@ in
        '';
      };

+      themes = mkOption {
+        type = types.listOf types.package;
+        default = [];
+        description = ''
+          Extra packages providing themes.
+        '';
+      };
+
+      setupScript = mkOption {
+        type = types.str;
+        default = "";
+        example = ''
+          # workaround for using NVIDIA Optimus without Bumblebee
+          xrandr --setprovideroutputsource modesetting NVIDIA-0
+          xrandr --auto
+        '';
+        description = ''
+          A script to execute when starting the display server.
+        '';
+      };
+
+      stopScript = mkOption {
+        type = types.str;
+        default = "";
+        description = ''
+          A script to execute when stopping the display server.
+        '';
+      };
+
      autoLogin = mkOption {
        default = {};
        description = ''
@ -93,7 +138,7 @@ in
        '';

        type = types.submodule {
-	  options = {
+          options = {
            enable = mkOption {
              type = types.bool;
              default = false;
@ -118,7 +163,7 @@ in
                will work only the first time.
              '';
            };
-	  };
+          };
        };
      };

@ -130,14 +175,16 @@ in

    assertions = [
      { assertion = cfg.autoLogin.enable -> cfg.autoLogin.user != null;
-        message = "SDDM auto-login requires services.xserver.displayManager.sddm.autoLogin.user to be set";
+        message = ''
+          SDDM auto-login requires services.xserver.displayManager.sddm.autoLogin.user to be set
+        '';
      }
      { assertion = cfg.autoLogin.enable -> elem defaultSessionName dmcfg.session.names;
        message = ''
          SDDM auto-login requires that services.xserver.desktopManager.default and
-	  services.xserver.windowMananger.default are set to valid values. The current
-	  default session: ${defaultSessionName} is not valid.
-	'';
+          services.xserver.windowMananger.default are set to valid values. The current
+          default session: ${defaultSessionName} is not valid.
+        '';
      }
    ];

@ -146,8 +193,7 @@ in
    services.xserver.displayManager.job = {
      logsXsession = true;

-      #execCmd = "${pkgs.sddm}/bin/sddm";
-      execCmd = "exec ${pkgs.sddm}/bin/sddm";
+      execCmd = "exec ${sddm}/bin/sddm";
    };

    security.pam.services = {
--- a/nixos/modules/system/boot/loader/grub/grub.nix
+++ b/nixos/modules/system/boot/loader/grub/grub.nix
@ -470,7 +470,7 @@ in
      ] ++ flip concatMap cfg.mirroredBoots (args: [
        {
          assertion = args.devices != [ ];
-          message = "A boot path cannot have an empty devices string in ${arg.path}";
+          message = "A boot path cannot have an empty devices string in ${args.path}";
        }
        {
          assertion = hasPrefix "/" args.path;
--- a/nixos/modules/testing/test-instrumentation.nix
+++ b/nixos/modules/testing/test-instrumentation.nix
@ -88,6 +88,10 @@ let kernel = config.boot.kernelPackages.kernel; in

    boot.consoleLogLevel = 7;

+    # Make sure we don't hit page allocation failures if the VM's memory is
+    # heavily fragmented.
+    boot.kernel.sysctl."vm.min_free_kbytes" = 16384;
+
    # Prevent tests from accessing the Internet.
    networking.defaultGateway = mkOverride 150 "";
    networking.nameservers = mkOverride 150 [ ];
--- a/nixos/modules/virtualisation/azure-agent.nix
+++ b/nixos/modules/virtualisation/azure-agent.nix
@ -0,0 +1,170 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.virtualisation.azure.agent;
+
+  waagent = with pkgs; stdenv.mkDerivation rec {
+    name = "waagent-2.0";
+    src = pkgs.fetchgit {
+      url = https://github.com/Phreedom/WALinuxAgent.git;
+      rev = "9dba81c7b1239c7971ec96e405e403c7cd224e6b";
+      sha256 = "0khxk3ns3z37v26f2qj6m3m698a0vqpc9bxg5p7fyr3xza5gzwhs";
+    };
+    buildInputs = [ makeWrapper python pythonPackages.wrapPython ];
+    runtimeDeps = [ findutils gnugrep gawk coreutils openssl openssh
+                    nettools # for hostname
+                    procps # for pidof
+                    shadow # for useradd, usermod
+                    utillinux # for (u)mount, fdisk, sfdisk, mkswap
+                    parted
+                  ];
+    pythonPath = [ pythonPackages.pyasn1 ];
+
+    configurePhase = false;
+    buildPhase = false;
+
+    installPhase = ''
+      substituteInPlace config/99-azure-product-uuid.rules \
+          --replace /bin/chmod "${coreutils}/bin/chmod"
+      mkdir -p $out/lib/udev/rules.d
+      cp config/*.rules $out/lib/udev/rules.d
+
+      mkdir -p $out/bin
+      cp waagent $out/bin/
+      chmod +x $out/bin/waagent
+
+      wrapProgram "$out/bin/waagent" \
+          --prefix PYTHONPATH : $PYTHONPATH \
+          --prefix PATH : "${makeSearchPath "bin" runtimeDeps}"
+    '';
+  };
+
+  provisionedHook = pkgs.writeScript "provisioned-hook" ''
+    #!${pkgs.stdenv.shell}
+    ${config.systemd.package}/bin/systemctl start provisioned.target
+  '';
+
+in
+
+{
+
+  ###### interface
+
+  options.virtualisation.azure.agent.enable = mkOption {
+    default = false;
+    description = "Whether to enable the Windows Azure Linux Agent.";
+  };
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+    assertions = [ {
+      assertion = pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64;
+      message = "Azure not currently supported on ${pkgs.stdenv.system}";
+    } {
+      assertion = config.networking.networkmanager.enable == false;
+      message = "Windows Azure Linux Agent is not compatible with NetworkManager";
+    } ];
+
+    boot.initrd.kernelModules = [ "ata_piix" ];
+    networking.firewall.allowedUDPPorts = [ 68 ];
+
+
+    environment.etc."waagent.conf".text = ''
+        #
+        # Windows Azure Linux Agent Configuration
+        #
+
+        Role.StateConsumer=${provisionedHook}
+
+        # Enable instance creation
+        Provisioning.Enabled=y
+
+        # Password authentication for root account will be unavailable.
+        Provisioning.DeleteRootPassword=n
+
+        # Generate fresh host key pair.
+        Provisioning.RegenerateSshHostKeyPair=y
+
+        # Supported values are "rsa", "dsa" and "ecdsa".
+        Provisioning.SshHostKeyPairType=ed25519
+
+        # Monitor host name changes and publish changes via DHCP requests.
+        Provisioning.MonitorHostName=y
+
+        # Decode CustomData from Base64.
+        Provisioning.DecodeCustomData=n
+
+        # Execute CustomData after provisioning.
+        Provisioning.ExecuteCustomData=n
+
+        # Format if unformatted. If 'n', resource disk will not be mounted.
+        ResourceDisk.Format=y
+
+        # File system on the resource disk
+        # Typically ext3 or ext4. FreeBSD images should use 'ufs2' here.
+        ResourceDisk.Filesystem=ext4
+
+        # Mount point for the resource disk
+        ResourceDisk.MountPoint=/mnt/resource
+
+        # Respond to load balancer probes if requested by Windows Azure.
+        LBProbeResponder=y
+
+        # Enable logging to serial console (y|n)
+        # When stdout is not enough...
+        # 'y' if not set
+        Logs.Console=y
+
+        # Enable verbose logging (y|n)
+        Logs.Verbose=n
+
+        # Root device timeout in seconds.
+        OS.RootDeviceScsiTimeout=300
+    '';
+
+    services.udev.packages = [ waagent ];
+
+    networking.dhcpcd.persistent = true;
+
+    services.logrotate = {
+      enable = true;
+      config = ''
+        /var/log/waagent.log {
+            compress
+            monthly
+            rotate 6
+            notifempty
+            missingok
+        }
+      '';
+    };
+
+    systemd.targets.provisioned = {
+      description = "Services Requiring Azure VM provisioning to have finished";
+      wantedBy = [ "sshd.service" ];
+      before = [ "sshd.service" ];
+    };
+
+
+    systemd.services.waagent = {
+      wantedBy = [ "sshd.service" ];
+      before = [ "sshd.service" ];
+      after = [ "ip-up.target" ];
+      wants = [ "ip-up.target" ];
+
+      path = [ pkgs.e2fsprogs ];
+      description = "Windows Azure Agent Service";
+      unitConfig.ConditionPathExists = "/etc/waagent.conf";
+      serviceConfig = {
+        ExecStart = "${waagent}/bin/waagent -daemon";
+        Type = "simple";
+      };
+    };
+
+  };
+
+}
--- a/nixos/modules/virtualisation/azure-common.nix
+++ b/nixos/modules/virtualisation/azure-common.nix
@ -4,6 +4,9 @@ with lib;
 {
  imports = [ ../profiles/headless.nix ];

+  require = [ ./azure-agent.nix ];
+  virtualisation.azure.agent.enable = true;
+
  boot.kernelParams = [ "console=ttyS0" "earlyprintk=ttyS0" "rootdelay=300" "panic=1" "boot.panic_on_fail" ];
  boot.initrd.kernelModules = [ "hv_vmbus" "hv_netvsc" "hv_utils" "hv_storvsc" ];

--- a/nixos/modules/virtualisation/azure-image.nix
+++ b/nixos/modules/virtualisation/azure-image.nix
@ -98,8 +98,8 @@ in
  systemd.services.fetch-ssh-keys =
    { description = "Fetch host keys and authorized_keys for root user";

-      wantedBy = [ "sshd.service" ];
-      before = [ "sshd.service" ];
+      wantedBy = [ "sshd.service" "waagent.service" ];
+      before = [ "sshd.service" "waagent.service" ];
      after = [ "local-fs.target" ];

      path  = [ pkgs.coreutils ];
@ -108,14 +108,14 @@ in
          eval "$(base64 --decode /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_ecdsa_key
-            chmod 600 /etc/ssh/ssh_host_ecdsa_key
+            echo "$ssh_host_ecdsa_key" > /etc/ssh/ssh_host_ed25519_key
+            chmod 600 /etc/ssh/ssh_host_ed25519_key
          fi

          if ! [ -z "$ssh_host_ecdsa_key_pub" ]; then
            echo "downloaded ssh_host_ecdsa_key_pub"
-            echo "$ssh_host_ecdsa_key_pub" > /etc/ssh/ssh_host_ecdsa_key.pub
-            chmod 644 /etc/ssh/ssh_host_ecdsa_key.pub
+            echo "$ssh_host_ecdsa_key_pub" > /etc/ssh/ssh_host_ed25519_key.pub
+            chmod 644 /etc/ssh/ssh_host_ed25519_key.pub
          fi

          if ! [ -z "$ssh_root_auth_key" ]; then
--- a/nixos/modules/virtualisation/rkt.nix
+++ b/nixos/modules/virtualisation/rkt.nix
@ -0,0 +1,62 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.virtualisation.rkt;
+in
+{
+  options.virtualisation.rkt = {
+    enable = mkEnableOption "rkt metadata service";
+
+    gc = {
+      automatic = mkOption {
+        default = true;
+        type = types.bool;
+        description = "Automatically run the garbage collector at a specific time.";
+      };
+
+      dates = mkOption {
+        default = "03:15";
+        type = types.str;
+        description = ''
+          Specification (in the format described by
+          <citerefentry><refentrytitle>systemd.time</refentrytitle>
+          <manvolnum>5</manvolnum></citerefentry>) of the time at
+          which the garbage collector will run.
+        '';
+      };
+
+      options = mkOption {
+        default = "--grace-period=24h";
+        type = types.str;
+        description = ''
+          Options given to <filename>rkt gc</filename> when the
+          garbage collector is run automatically.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    environment.systemPackages = [ pkgs.rkt ];
+
+    systemd.services.rkt = {
+      description = "rkt metadata service";
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network.target" ];
+      serviceConfig = {
+        ExecStart = "${pkgs.rkt}/bin/rkt metadata-service";
+      };
+    };
+
+    systemd.services.rkt-gc = {
+      description = "rkt garbage collection";
+      startAt = optionalString cfg.gc.automatic cfg.gc.dates;
+      serviceConfig = {
+        Type = "oneshot";
+        ExecStart = "${pkgs.rkt}/bin/rkt gc ${cfg.gc.options}";
+      };
+    };
+  };
+}
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@ -83,6 +83,7 @@ in rec {
        (all nixos.tests.openssh)
        (all nixos.tests.printing)
        (all nixos.tests.proxy)
+        (all nixos.tests.sddm)
        (all nixos.tests.simple)
        (all nixos.tests.udisks2)
        (all nixos.tests.xfce)
--- a/nixos/release.nix
+++ b/nixos/release.nix
@ -287,6 +287,7 @@ in rec {
  tests.quake3 = callTest tests/quake3.nix {};
  tests.runInMachine = callTest tests/run-in-machine.nix {};
  tests.sddm = callTest tests/sddm.nix {};
+  tests.sddm-kde5 = callTest tests/sddm-kde5.nix {};
  tests.simple = callTest tests/simple.nix {};
  tests.tomcat = callTest tests/tomcat.nix {};
  tests.udisks2 = callTest tests/udisks2.nix {};
--- a/nixos/tests/sddm-kde5.nix
+++ b/nixos/tests/sddm-kde5.nix
@ -0,0 +1,29 @@
+import ./make-test.nix ({ pkgs, ...} : {
+  name = "sddm";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ ttuegel ];
+  };
+
+  machine = { lib, ... }: {
+    imports = [ ./common/user-account.nix ];
+    services.xserver.enable = true;
+    services.xserver.displayManager.sddm = {
+      enable = true;
+      autoLogin = {
+        enable = true;
+        user = "alice";
+      };
+    };
+    services.xserver.windowManager.default = "icewm";
+    services.xserver.windowManager.icewm.enable = true;
+    services.xserver.desktopManager.default = "none";
+    services.xserver.desktopManager.kde5.enable = true;
+  };
+
+  enableOCR = true;
+
+  testScript = { nodes, ... }: ''
+    startAll;
+    $machine->waitForWindow("^IceWM ");
+  '';
+})
--- a/pkgs/applications/display-managers/sddm/default.nix
+++ b/pkgs/applications/display-managers/sddm/default.nix
@ -1,54 +1,85 @@
-{ stdenv, fetchpatch, makeQtWrapper, fetchFromGitHub, cmake, pkgconfig, libxcb, libpthreadstubs
-, libXdmcp, libXau, qtbase, qtdeclarative, qttools, pam, systemd }:
+{ stdenv, makeQtWrapper, fetchFromGitHub
+, cmake, pkgconfig, libxcb, libpthreadstubs, lndir
+, libXdmcp, libXau, qtbase, qtdeclarative, qttools, pam, systemd
+, themes
+}:

 let
  version = "0.13.0";
+
+  unwrapped = stdenv.mkDerivation rec {
+    name = "sddm-unwrapped-${version}";
+
+    src = fetchFromGitHub {
+      owner = "sddm";
+      repo = "sddm";
+      rev = "v${version}";
+      sha256 = "0c3q8lpb123m9k5x3i71mm8lmyzhknw77zxh89yfl8qmn6zd61i1";
+    };
+
+    patches = [
+      ./0001-ignore-config-mtime.patch
+      ./0002-fix-ConfigReader-QStringList-corruption.patch
+    ];
+
+    nativeBuildInputs = [ cmake pkgconfig qttools ];
+
+    buildInputs = [
+      libxcb libpthreadstubs libXdmcp libXau qtbase qtdeclarative pam systemd
+    ];
+
+    cmakeFlags = [
+      "-DCONFIG_FILE=/etc/sddm.conf"
+      # Set UID_MIN and UID_MAX so that the build script won't try
+      # to read them from /etc/login.defs (fails in chroot).
+      # The values come from NixOS; they may not be appropriate
+      # for running SDDM outside NixOS, but that configuration is
+      # not supported anyway.
+      "-DUID_MIN=1000"
+      "-DUID_MAX=29999"
+    ];
+
+    preConfigure = ''
+      export cmakeFlags="$cmakeFlags -DQT_IMPORTS_DIR=$out/lib/qt5/qml -DCMAKE_INSTALL_SYSCONFDIR=$out/etc -DSYSTEMD_SYSTEM_UNIT_DIR=$out/lib/systemd/system"
+    '';
+
+    enableParallelBuilding = true;
+
+    postInstall = ''
+      # remove empty scripts
+      rm "$out/share/sddm/scripts/Xsetup" "$out/share/sddm/scripts/Xstop"
+    '';
+
+    meta = with stdenv.lib; {
+      description = "QML based X11 display manager";
+      homepage = https://github.com/sddm/sddm;
+      platforms = platforms.linux;
+      maintainers = with maintainers; [ abbradar ttuegel ];
+    };
+  };
+
 in
-stdenv.mkDerivation rec {
+
+stdenv.mkDerivation {
  name = "sddm-${version}";
+  phases = "installPhase";

-  src = fetchFromGitHub {
-    owner = "sddm";
-    repo = "sddm";
-    rev = "v${version}";
-    sha256 = "0c3q8lpb123m9k5x3i71mm8lmyzhknw77zxh89yfl8qmn6zd61i1";
-  };
+  nativeBuildInputs = [ lndir makeQtWrapper ];
+  buildInputs = [ unwrapped ] ++ themes;
+  inherit themes;
+  inherit unwrapped;

-  patches = [
-    ./0001-ignore-config-mtime.patch
-    ./0002-fix-ConfigReader-QStringList-corruption.patch
-  ];
+  installPhase = ''
+    makeQtWrapper "$unwrapped/bin/sddm" "$out/bin/sddm"

-  nativeBuildInputs = [ cmake makeQtWrapper pkgconfig qttools ];
-
-  buildInputs = [ libxcb libpthreadstubs libXdmcp libXau qtbase qtdeclarative pam systemd ];
-
-  cmakeFlags = [
-    "-DCONFIG_FILE=/etc/sddm.conf"
-    # Set UID_MIN and UID_MAX so that the build script won't try
-    # to read them from /etc/login.defs (fails in chroot).
-    # The values come from NixOS; they may not be appropriate
-    # for running SDDM outside NixOS, but that configuration is
-    # not supported anyway.
-    "-DUID_MIN=1000"
-    "-DUID_MAX=29999"
-  ];
-
-  preConfigure = ''
-    export cmakeFlags="$cmakeFlags -DQT_IMPORTS_DIR=$out/lib/qt5/qml -DCMAKE_INSTALL_SYSCONFDIR=$out/etc -DSYSTEMD_SYSTEM_UNIT_DIR=$out/lib/systemd/system"
+    mkdir -p "$out/share/sddm"
+    for pkg in $unwrapped $themes; do
+        local sddmDir="$pkg/share/sddm"
+        if [[ -d "$sddmDir" ]]; then
+            lndir -silent "$sddmDir" "$out/share/sddm"
+        fi
+    done
  '';

-  postInstall = ''
-    wrapQtProgram $out/bin/sddm
-    wrapQtProgram $out/bin/sddm-greeter
-  '';
-
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
-    description = "QML based X11 display manager";
-    homepage = https://github.com/sddm/sddm;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ abbradar ];
-  };
+  inherit (unwrapped) meta;
 }
--- 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.2.0";
+  version = "1.3.1";

  src = fetchurl {
    url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";
-    sha256 = "05s3kvsz6pzh4gm22aaps1nccp76skfshdzlqwg0qn0ljz58sdqh";
+    sha256 = "17q5vrvjsyxcd8favp0sldfvhcwr0ba6ws32df6iv2iyla5h94y1";
    name = "${name}.deb";
  };

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

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

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

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

    meta = with stdenv.lib; {
--- a/pkgs/applications/editors/idea/default.nix
+++ b/pkgs/applications/editors/idea/default.nix
@ -297,13 +297,13 @@ in

  phpstorm = buildPhpStorm rec {
    name = "phpstorm-${version}";
-    version = "9.0";
-    build = "PS-141.1912";
+    version = "10.0.1";
+    build = "PS-143.382";
    description = "Professional IDE for Web and PHP developers";
    license = stdenv.lib.licenses.unfree;
    src = fetchurl {
      url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz";
-      sha256 = "1n6p8xiv0nrs6yf0250mpga291msnrfamv573dva9f17cc3df2pp";
+      sha256 = "12bqil8pxzmbv8a7pxn2529ph2x7szr3wvkvgxaisydm463kpdk8";
    };
  };

@ -311,7 +311,7 @@ in
    name = "webstorm-${version}";
    version = "10.0.4";
    build = "141.1550";
-    description = "Professional IDE for Web and JavaScript devlopment";
+    description = "Professional IDE for Web and JavaScript development";
    license = stdenv.lib.licenses.unfree;
    src = fetchurl {
      url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz";
--- a/pkgs/applications/graphics/fontmatrix/default.nix
+++ b/pkgs/applications/graphics/fontmatrix/default.nix
@ -0,0 +1,19 @@
+{ stdenv, fetchurl, cmake, qt4 }:
+
+stdenv.mkDerivation rec {
+  name = "fontmatrix-0.6.0";
+  src = fetchurl {
+    url = "http://fontmatrix.be/archives/${name}-Source.tar.gz";
+    sha256 = "bcc5e929d95d2a0c9481d185144095c4e660255220a7ae6640298163ee77042c";
+  };
+
+  buildInputs = [ qt4 ];
+
+  nativeBuildInputs = [ cmake ];
+
+  meta = {
+    description = "Fontmatrix is a free/libre font explorer for Linux, Windows and Mac";
+    homepage = http://fontmatrix.be/;
+    license = stdenv.lib.licenses.gpl2;
+  };
+}
--- a/pkgs/applications/graphics/imv/default.nix
+++ b/pkgs/applications/graphics/imv/default.nix
@ -4,13 +4,13 @@

 stdenv.mkDerivation rec {
  name = "imv-${version}";
-  version = "1.0.0";
+  version = "1.1.0";

  src = fetchFromGitHub {
    owner = "eXeC64";
    repo  = "imv";
-    rev = "f2ce793d628e88825eff3364b293104cb0bdb582";
-    sha256 = "1xqaqbfjgksbjmy1yy7q4sv5bak7w8va60xa426jzscy9cib2sgh";
+    rev = "4d1a6d581b70b25d9533c5c788aab6900ebf82bb";
+    sha256 = "1c5r4pqqypir8ymicxyn2k7mhq8nl88b3x6giaafd77ssjn0vz9r";
  };

  buildInputs = [ SDL2 freeimage ];
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
  meta = with stdenv.lib; {
    description = "A command line image viewer for tiling window managers";
    homepage    = https://github.com/eXeC64/imv; 
-    license     = licenses.mit;
+    license     = licenses.gpl2;
    maintainers = with maintainers; [ rnhmjoj ];
    platforms   = platforms.unix;
  };
--- a/pkgs/applications/graphics/ipe/default.nix
+++ b/pkgs/applications/graphics/ipe/default.nix
@ -1,7 +1,8 @@
-{ stdenv, fetchurl, pkgconfig, zlib, freetype, cairo, lua5, texLive, ghostscriptX
+{ stdenv, fetchurl, pkgconfig, zlib, freetype, cairo, lua5, texlive, ghostscript
 , libjpeg, qtbase
-, makeWrapper }:
-let ghostscript = ghostscriptX; in
+, makeQtWrapper
+}:
+
 stdenv.mkDerivation rec {
  name = "ipe-7.1.10";

@ -21,16 +22,18 @@ stdenv.mkDerivation rec {
  '';

  IPEPREFIX="$$out";
-  URWFONTDIR="${texLive}/texmf-dist/fonts/type1/urw/";
+  URWFONTDIR="${texlive}/texmf-dist/fonts/type1/urw/";
  LUA_PACKAGE = "lua";

  buildInputs = [
-    libjpeg pkgconfig zlib qtbase freetype cairo lua5 texLive ghostscript makeWrapper
+    libjpeg pkgconfig zlib qtbase freetype cairo lua5 texlive ghostscript
  ];

-  postInstall = ''
+  nativeBuildInputs = [ makeQtWrapper ];
+
+  postFixup = ''
    for prog in $out/bin/*; do
-      wrapProgram "$prog" --prefix PATH : "${texLive}/bin"
+      wrapQtProgram "$prog" --prefix PATH : "${texlive}/bin"
    done
  '';

--- a/pkgs/applications/graphics/mcomix/default.nix
+++ b/pkgs/applications/graphics/mcomix/default.nix
@ -1,4 +1,4 @@
-{ stdenv, fetchurl, buildPythonPackage, pygtk, pil, python27Packages }:
+{ stdenv, fetchurl, buildPythonPackage, python27Packages }:

 buildPythonPackage rec {
    namePrefix = "";
@ -9,7 +9,7 @@ buildPythonPackage rec {
      sha256 = "0k3pqbvk08kb1nr0qldaj9bc7ca6rvcycgfi2n7gqmsirq5kscys";
    };

-    pythonPath = [ pygtk pil python27Packages.sqlite3 ];
+    propagatedBuildInputs = with python27Packages; [ pygtk pillow sqlite3 ];

    meta = {
      description = "Image viewer designed to handle comic books";
--- a/pkgs/applications/graphics/mirage/default.nix
+++ b/pkgs/applications/graphics/mirage/default.nix
@ -1,4 +1,4 @@
-{ stdenv, fetchurl, buildPythonPackage, python, pygtk, pil, libX11, gettext }:
+{ stdenv, fetchurl, buildPythonPackage, python, pygtk, pillow, libX11, gettext }:

 buildPythonPackage rec {
    namePrefix = "";
@ -17,7 +17,7 @@ buildPythonPackage rec {
      sed -i "s@/usr/local/share/locale@$out/share/locale@" mirage.py
    '';

-    pythonPath = [ pygtk pil ];
+    propagatedBuildInputs = [ pygtk pillow ];

    meta = {
      description = "Simple image viewer written in PyGTK";
--- a/pkgs/applications/graphics/pencil/default.nix
+++ b/pkgs/applications/graphics/pencil/default.nix
@ -1,13 +1,12 @@
 { stdenv, fetchurl, makeWrapper, xulrunner }:

 stdenv.mkDerivation rec {
-  version = "2.0.14";
+  version = "2.0.15";
  name = "pencil-${version}";

  src = fetchurl {
    url = "https://github.com/prikhi/pencil/releases/download/v${version}/Pencil-${version}-linux-pkg.tar.gz";
-    sha256 = "59f46db863e6d95ee6987e600d658ad4b58b03b0744c5c6d17ce04f5ae92d260";
-
+    sha256 = "be338558b613f51506337a2c7c80f209e8644656c2925f41c294e2872feabc3b";
  };

  buildPhase = "";
--- a/pkgs/applications/graphics/potrace/default.nix
+++ b/pkgs/applications/graphics/potrace/default.nix
@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {
  name = "potrace-${version}";
-  version = "1.12";
+  version = "1.13";

  src = fetchurl {
    url = "http://potrace.sourceforge.net/download/${version}/potrace-${version}.tar.gz";
-    sha256 = "0fqpfq5wwqz8j6pfh4p2pbflf6r86s4h63r8jawzrsyvpbbz3fxh";
+    sha256 = "115p2vgyq7p2mf4nidk2x3aa341nvv2v8ml056vbji36df5l6lk2";
  };

  configureFlags = [ "--with-libpotrace" ];
--- 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, libusb
-, libxml2, makeWrapper, pkgconfig, saneBackends, systemd, vala }:
+{ stdenv, fetchurl, cairo, colord, glib, gtk3, gusb, intltool, itstool
+, libusb, libxml2, pkgconfig, saneBackends, vala, wrapGAppsHook }:

 let version = "3.19.2"; in
 stdenv.mkDerivation rec {
@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
  };

  buildInputs = [ cairo colord glib gusb gtk3 libusb libxml2 saneBackends
-    systemd vala ];
-  nativeBuildInputs = [ intltool itstool makeWrapper pkgconfig ];
+    vala ];
+  nativeBuildInputs = [ intltool itstool pkgconfig wrapGAppsHook ];

  configureFlags = [ "--disable-packagekit" ];

@ -25,11 +25,6 @@ stdenv.mkDerivation rec {

  doCheck = true;

-  preFixup = ''
-    wrapProgram "$out/bin/simple-scan" \
-      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
-  '';
-
  meta = with stdenv.lib; {
    inherit version;
    description = "Simple scanning utility";
--- a/pkgs/applications/kde-apps-15.08/kdelibs/default.nix
+++ b/pkgs/applications/kde-apps-15.08/kdelibs/default.nix
@ -1,5 +1,5 @@
 { kdeApp, attica, attr, automoc4, avahi, bison, cmake
-, docbook_xml_dtd_42, docbook_xsl, flex, giflib, herqq, ilmbase
+, docbook_xml_dtd_42, docbook_xsl, flex, giflib, ilmbase
 , libdbusmenu_qt, libjpeg, libxml2, libxslt, perl, phonon, pkgconfig
 , polkit_qt4, qca2, qt4, shared_desktop_ontologies, shared_mime_info
 , soprano, strigi, udev, xz
@ -10,7 +10,7 @@ kdeApp {
  name = "kdelibs";

  buildInputs = [
-    attica attr avahi giflib herqq libdbusmenu_qt libjpeg libxml2
+    attica attr avahi giflib libdbusmenu_qt libjpeg libxml2
    polkit_qt4 qca2 shared_desktop_ontologies udev xz
  ];
  propagatedBuildInputs = [ qt4 soprano phonon strigi ];
@ -30,7 +30,6 @@ kdeApp {
  cmakeFlags = [
    "-DDOCBOOKXML_CURRENTDTD_DIR=${docbook_xml_dtd_42}/xml/dtd/docbook"
    "-DDOCBOOKXSL_DIR=${docbook_xsl}/xml/xsl/docbook"
-    "-DHUPNP_ENABLED=ON"
    "-DWITH_SOLID_UDISKS2=ON"
    "-DKDE_DEFAULT_HOME=.kde"
  ];
--- a/pkgs/applications/kde-apps-15.12/default.nix
+++ b/pkgs/applications/kde-apps-15.12/default.nix
@ -49,6 +49,6 @@ let
    l10n = pkgs.recurseIntoAttrs (import ./l10n.nix { inherit callPackage lib pkgs; });
  };

-  newScope = scope: pkgs.kf516.newScope ({ inherit kdeApp; } // scope);
+  newScope = scope: pkgs.kf517.newScope ({ inherit kdeApp; } // scope);

 in lib.makeScope newScope packages
--- 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/unstable/applications/15.11.80/ -A *.tar.xz'
+WGET_ARGS='http://download.kde.org/unstable/applications/15.11.90/ -A *.tar.xz'

 mkdir tmp; cd tmp

--- a/pkgs/applications/kde-apps-15.12/srcs.nix
+++ b/pkgs/applications/kde-apps-15.12/srcs.nix
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@ -1,16 +1,16 @@
 { stdenv, fetchurl, python, pyqt5, sip_4_16, poppler_utils, pkgconfig, libpng
 , imagemagick, libjpeg, fontconfig, podofo, qt5, icu, sqlite
-, pil, makeWrapper, unrar, chmlib, pythonPackages, xz, libusb1, libmtp
+, makeWrapper, unrar, chmlib, pythonPackages, xz, libusb1, libmtp
 , xdg_utils
 }:

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

  src = fetchurl {
    url = "http://download.calibre-ebook.com/${version}/${name}.tar.xz";
-    sha256 = "1s3wrrvp2d0mczs09g2xkkknvlk3max6ws7awpss5kkdpjvay6ma";
+    sha256 = "0ig1pb62w57l6nhwg391mkjhw9dyicix6xigpdyw0320jdw9nlkb";
  };

  inherit python;
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {

  buildInputs =
    [ python pyqt5 sip_4_16 poppler_utils libpng imagemagick libjpeg
-      fontconfig podofo qt5.base pil chmlib icu sqlite libusb1 libmtp xdg_utils
+      fontconfig podofo qt5.base chmlib icu sqlite libusb1 libmtp xdg_utils
      pythonPackages.mechanize pythonPackages.lxml pythonPackages.dateutil
      pythonPackages.cssutils pythonPackages.beautifulsoup pythonPackages.pillow
      pythonPackages.sqlite3 pythonPackages.netifaces pythonPackages.apsw
--- a/pkgs/applications/misc/goldendict/default.nix
+++ b/pkgs/applications/misc/goldendict/default.nix
@ -1,11 +1,11 @@
 { stdenv, fetchFromGitHub, pkgconfig, qt4, libXtst, libvorbis, hunspell, libao, ffmpeg, libeb, lzo, xz, libtiff }:
 stdenv.mkDerivation rec {
-  name = "goldendict-1.5.0.20150801";
+  name = "goldendict-1.5.0.ec86515";
  src = fetchFromGitHub {
    owner = "goldendict";
    repo = "goldendict";
-    rev = "b4bb1e9635c764aa602fbeaeee661f35e461d062";
-    sha256 = "0dhaa0nii226541al3i2d8x8h7cfh96w5vkw3pa3l74llgrj7yx2";
+    rev = "ec865158f5b7116f629e4d451a39ee59093eefa5";
+    sha256 = "070majwxbn15cy7sbgz7ljl8rkn7vcgkm10884v97csln7bfzwhr";
  };

  buildInputs = [ pkgconfig qt4 libXtst libvorbis hunspell libao ffmpeg libeb lzo xz libtiff ];
--- a/pkgs/applications/misc/gosmore/default.nix
+++ b/pkgs/applications/misc/gosmore/default.nix
@ -1,13 +1,13 @@
 { stdenv, fetchsvn, libxml2, gtk, curl, pkgconfig } :

 let
-  version = "30811";
+  version = "31801";
 in
 stdenv.mkDerivation {
  name = "gosmore-r${version}";
  src = fetchsvn {
    url = http://svn.openstreetmap.org/applications/rendering/gosmore;
-    sha256 = "0d8ddfa0nhz51ambwj9y5jjbizl9y9w44sviisk3ysqvn8q0phds";
+    sha256 = "0i6m3ikavsaqhfy18sykzq0cflw978nr4fhg18hawndcmr45v5zj";
    rev = "${version}";
  };

--- a/pkgs/applications/misc/playonlinux/default.nix
+++ b/pkgs/applications/misc/playonlinux/default.nix
@ -1,8 +1,6 @@
 { stdenv
 , makeWrapper
 , fetchurl
-, wxPython
-, libXmu
 , cabextract
 , gettext
 , glxinfo
@ -11,18 +9,46 @@
 , imagemagick
 , netcat
 , p7zip
-, python
+, python2Packages
 , unzip
 , wget
 , wine
 , xdg-user-dirs
 , xterm
+, pkgs
+, pkgsi686Linux
 }:

-stdenv.mkDerivation rec {
-  name = "playonlinux-${version}";
+let
  version = "4.2.9";

+  binpath = stdenv.lib.makeSearchPath "bin"
+    [ cabextract
+      python2Packages.python
+      gettext
+      glxinfo
+      gnupg1compat
+      icoutils
+      imagemagick
+      netcat
+      p7zip
+      unzip
+      wget
+      wine
+      xdg-user-dirs
+      xterm
+    ];
+
+  ld32 =
+    if stdenv.system == "x86_64-linux" then "${stdenv.cc}/nix-support/dynamic-linker-m32"
+    else if stdenv.system == "i686-linux" then "${stdenv.cc}/nix-support/dynamic-linker"
+    else abort "Unsupported platform for PlayOnLinux: ${stdenv.system}";
+  ld64 = "${stdenv.cc}/nix-support/dynamic-linker";
+  libs = pkgs: stdenv.lib.makeLibraryPath [ pkgs.xlibs.libX11 ];
+
+in stdenv.mkDerivation {
+  name = "playonlinux-${version}";
+
  src = fetchurl {
    url = "https://www.playonlinux.com/script_files/PlayOnLinux/${version}/PlayOnLinux_${version}.tar.gz";
    sha256 = "89bb0fd7cce8cf598ebf38cad716b8587eaca5b916d54386fb24b3ff66b48624";
@ -31,74 +57,34 @@ stdenv.mkDerivation rec {
  nativeBuildInputs = [ makeWrapper ];

  buildInputs =
-    [ wxPython
-      libXmu
-      cabextract
-      gettext
-      glxinfo
-      gnupg1compat
-      icoutils
-      imagemagick
-      netcat
-      p7zip
-      python
-      unzip
-      wget
-      wine
-      xdg-user-dirs
-      xterm
+    [ python2Packages.python
+      python2Packages.wxPython
+      python2Packages.setuptools
    ];

  patchPhase = ''
-    PYFILES="python/*.py python/lib/*.py tests/python/*.py"
-    sed -i "s/env python[0-9.]*/python/" $PYFILES
+    patchShebangs python tests/python
    sed -i "s/ %F//g" etc/PlayOnLinux.desktop
  '';

  installPhase = ''
    install -d $out/share/playonlinux
-    install -d $out/bin
    cp -r . $out/share/playonlinux/

-    echo "#!${stdenv.shell}" > $out/bin/playonlinux
-    echo "$prefix/share/playonlinux/playonlinux \"\$@\"" >> $out/bin/playonlinux
-    chmod +x $out/bin/playonlinux
-
    install -D -m644 etc/PlayOnLinux.desktop $out/share/applications/playonlinux.desktop
-  '';

-  preFixupPhases = [ "preFixupPhase" ];
+    makeWrapper $out/share/playonlinux/playonlinux $out/bin/playonlinux \
+      --prefix PYTHONPATH : $PYTHONPATH:$(toPythonPath "$out") \
+      --prefix PATH : ${binpath}

-  preFixupPhase = ''
-    for f in $out/bin/*; do
-      wrapProgram $f \
-        --prefix PYTHONPATH : $PYTHONPATH:$(toPythonPath "$out") \
-        --prefix PATH : \
-    ${cabextract}/bin:\
-    ${gettext}/bin:\
-    ${glxinfo}/bin:\
-    ${gnupg1compat}/bin:\
-    ${icoutils}/bin:\
-    ${imagemagick}/bin:\
-    ${netcat}/bin:\
-    ${p7zip}/bin:\
-    ${python}/bin:\
-    ${unzip}/bin:\
-    ${wget}/bin:\
-    ${wine}/bin:\
-    ${xdg-user-dirs}/bin:\
-    ${xterm}/bin
-
-    done
-
-    for f in $out/share/playonlinux/bin/*; do
-      bunzip2 $f
-    done
-  '';
-
-  postFixupPhases = [ "postFixupPhase" ];
-
-  postFixupPhase = ''
+    bunzip2 $out/share/playonlinux/bin/check_dd_x86.bz2
+    patchelf --set-interpreter $(cat ${ld32}) --set-rpath ${libs pkgsi686Linux} $out/share/playonlinux/bin/check_dd_x86
+    ${if stdenv.system == "x86_64-linux" then ''
+      bunzip2 $out/share/playonlinux/bin/check_dd_amd64.bz2
+      patchelf --set-interpreter $(cat ${ld64}) --set-rpath ${libs pkgs} $out/share/playonlinux/bin/check_dd_amd64
+    '' else ''
+      rm $out/share/playonlinux/bin/check_dd_amd64.bz2
+    ''}
    for f in $out/share/playonlinux/bin/*; do
      bzip2 $f
    done
@ -109,6 +95,6 @@ stdenv.mkDerivation rec {
    homepage = https://www.playonlinux.com/;
    license = licenses.gpl3;
    maintainers = [ maintainers.a1russell ];
-    platforms = platforms.linux;
+    platforms = [ "x86_64-linux" "i686-linux" ];
  };
 }
--- a/pkgs/applications/misc/redshift/default.nix
+++ b/pkgs/applications/misc/redshift/default.nix
@ -1,5 +1,5 @@
 { fetchurl, stdenv, gettext, intltool, makeWrapper, pkgconfig
-, geoclue
+, geoclue2
 , guiSupport ? true, hicolor_icon_theme, gtk3, python, pygobject3, pyxdg
 , drmSupport ? true, libdrm
 , randrSupport ? true, libxcb
@ -17,7 +17,7 @@ stdenv.mkDerivation {
    url = "https://github.com/jonls/redshift/releases/download/v${version}/redshift-${version}.tar.xz";
  };

-  buildInputs = [ geoclue ]
+  buildInputs = [ geoclue2 ]
    ++ stdenv.lib.optionals guiSupport [ hicolor_icon_theme gtk3 python pygobject3 pyxdg ]
    ++ stdenv.lib.optionals drmSupport [ libdrm ]
    ++ stdenv.lib.optionals randrSupport [ libxcb ]
--- a/pkgs/applications/misc/rtv/default.nix
+++ b/pkgs/applications/misc/rtv/default.nix
@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, pkgs, lib, python, pythonPackages }:

 pythonPackages.buildPythonPackage rec {
-  version = "1.6.1";
+  version = "1.7.0";
  name = "rtv-${version}";

  src = fetchFromGitHub {
    owner = "michael-lazar";
    repo = "rtv";
    rev = "v${version}";
-    sha256 = "0ywx4h37b25w36vln2ydpw73ysbbkpibp597cghsfn2izlaa0i02";
+    sha256 = "0fynymia3c2rynq9bm0jssd3rad7f7hhmjpkby7yj6g3jvk7jn4x";
  };

  propagatedBuildInputs = with pythonPackages; [
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
@ -36,7 +36,7 @@

 let
  # -> http://get.adobe.com/flashplayer/
-  version = "11.2.202.540";
+  version = "11.2.202.554";

  src =
    if stdenv.system == "x86_64-linux" then
@ -47,7 +47,7 @@ let
      else rec {
        inherit version;
        url = "http://fpdownload.adobe.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.x86_64.tar.gz";
-        sha256 = "0zya9n5h669wbna182ig6dl4yf5sv4lvqk19rqhcwv3i718b0ai6";
+        sha256 = "15zziclffvsa0wpygkwzbh3v367n73pmzwsnkanhg75rv28dgl3x";
      }
    else if stdenv.system == "i686-linux" then
      if debug then
@ -60,7 +60,7 @@ let
      else rec {
        inherit version;
        url = "http://fpdownload.adobe.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.i386.tar.gz";
-        sha256 = "1n8ik5f257s388ql7gkmfh1iqil0g4kzxh3zsv2x8r6ssrvpq1by";
+        sha256 = "1a26l6lz5l6qbx4lm7266pzk0zr77h6issbnayr6df9qj99bppyz";
      }
    else throw "Flash Player is not supported on this platform";

@ -91,6 +91,6 @@ stdenv.mkDerivation {
    description = "Adobe Flash Player browser plugin";
    homepage = http://www.adobe.com/products/flashplayer/;
    license = stdenv.lib.licenses.unfree;
-    maintainers = [ stdenv.lib.maintainers.enolan ];
+    maintainers = [];
  };
 }
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@ -45,10 +45,11 @@ let
  desktopItem = makeDesktopItem {
    name = "dropbox";
    exec = "dropbox";
-    comment = "Online directories";
+    comment = "Sync your files across computers and to the web";
    desktopName = "Dropbox";
-    genericName = "Online storage";
-    categories = "Application;Internet;";
+    genericName = "File Synchronizer";
+    categories = "Network;FileTransfer;";
+    startupNotify = "false";
  };

 in stdenv.mkDerivation {
--- a/pkgs/applications/networking/p2p/tribler/default.nix
+++ b/pkgs/applications/networking/p2p/tribler/default.nix
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
    pythonPackages.twisted
    pythonPackages.gmpy
    pythonPackages.netifaces
-    pythonPackages.pil
+    pythonPackages.pillow
    pythonPackages.pycrypto
    pythonPackages.pyasn1
    pythonPackages.requests
--- a/pkgs/applications/office/impressive/default.nix
+++ b/pkgs/applications/office/impressive/default.nix
@ -1,5 +1,5 @@
 { fetchurl, stdenv, python, makeWrapper, lib
-, xpdf, pil, pyopengl, pygame
+, xpdf, pillow, pyopengl, pygame
 , setuptools, mesa, freeglut }:

 let version = "0.10.5";
@ -17,7 +17,7 @@ in

    # Note: We need to have `setuptools' in the path to be able to use
    # PyOpenGL.
-    buildInputs = [ makeWrapper xpdf pil pyopengl pygame ];
+    buildInputs = [ makeWrapper xpdf pillow pyopengl pygame ];

    configurePhase = ''
      sed -i "impressive.py" \
@ -44,7 +44,7 @@ in
                  ${lib.concatStringsSep ":"
                     (map (path:
                            path + "/lib/${python.libPrefix}/site-packages")
-                          [ pil pyopengl pygame setuptools ])} \
+                          [ pillow pyopengl pygame setuptools ])} \
         --prefix LIBRARY_PATH ":" "${mesa}/lib:${freeglut}/lib"
    '';

--- a/pkgs/applications/science/electronics/eagle/default.nix
+++ b/pkgs/applications/science/electronics/eagle/default.nix
@ -1,24 +1,34 @@
 { stdenv, fetchurl, makeDesktopItem, patchelf, zlib, freetype, fontconfig
 , openssl, libXrender, libXrandr, libXcursor, libX11, libXext, libXi
+, libxcb, cups, xkeyboardconfig
 }:

 let

  libPath = stdenv.lib.makeLibraryPath
    [ zlib freetype fontconfig openssl libXrender libXrandr libXcursor libX11
-      libXext libXi
+      libXext libXi libxcb cups
    ];

 in

 stdenv.mkDerivation rec {
  name = "eagle-${version}";
-  version = "6.6.0";
+  version = "7.5.0";

-  src = fetchurl {
-    url = "ftp://ftp.cadsoft.de/eagle/program/6.6/eagle-lin-${version}.run";
-    sha256 = "0m5289daah85b2rwpivnh2z1573v6j4alzjy9hg78fkb9jdgbn0x";
-  };
+  src =
+    if stdenv.system == "i686-linux" then
+      fetchurl {
+        url = "ftp://ftp.cadsoft.de/eagle/program/7.5/eagle-lin32-${version}.run";
+        sha256 = "1yfpfv2bqppc95964dhn38g0hq198wnz88lq2dmh517z7jlq9j5g";
+      }
+    else if stdenv.system == "x86_64-linux" then
+      fetchurl {
+        url = "ftp://ftp.cadsoft.de/eagle/program/7.5/eagle-lin64-${version}.run";
+        sha256 = "0msd0sn8yfln96mf7j5rc3b8amprxn87vmpq4wsz2cnmgd8xq0s9";
+      }
+    else
+      throw "Unsupported system: ${stdenv.system}";

  desktopItem = makeDesktopItem {
    name = "eagle";
@ -65,6 +75,7 @@ stdenv.mkDerivation rec {
    #!${stdenv.shell}
    export LD_LIBRARY_PATH="${stdenv.cc.cc}/lib:${libPath}"
    export LD_PRELOAD="$out/lib/eagle_fixer.so"
+    export QT_XKB_CONFIG_ROOT="${xkeyboardconfig}/share/X11/xkb"
    exec "$dynlinker" "$out/eagle-${version}/bin/eagle" "\$@"
    EOF
    chmod a+x "$out"/bin/eagle
--- a/pkgs/applications/science/math/R/default.nix
+++ b/pkgs/applications/science/math/R/default.nix
@ -6,11 +6,11 @@
 }:

 stdenv.mkDerivation rec {
-  name = "R-3.2.2";
+  name = "R-3.2.3";

  src = fetchurl {
    url = "http://cran.r-project.org/src/base/R-3/${name}.tar.gz";
-    sha256 = "07a6s865bjnh7w0fqsrkv1pva76w99v86w0w787qpdil87km54cw";
+    sha256 = "b93b7d878138279234160f007cb9b7f81b8a72c012a15566e9ec5395cfd9b6c1";
  };

  buildInputs = [ bzip2 gfortran libX11 libXmu libXt
@ -19,8 +19,7 @@ stdenv.mkDerivation rec {
    which jdk openblas curl
  ];

-  patches = [ ./no-usr-local-search-paths.patch
-              ./fix-tests-without-recommended-packages.patch ];
+  patches = [ ./no-usr-local-search-paths.patch ];

  preConfigure = ''
    configureFlagsArray=(
--- a/pkgs/applications/science/math/R/fix-tests-without-recommended-packages.patch
+++ b/pkgs/applications/science/math/R/fix-tests-without-recommended-packages.patch
@ -1,24 +0,0 @@
-diff -Naur R-3.2.2-upstream/tests/reg-packages.R R-3.2.2/tests/reg-packages.R
--- R-3.2.2-upstream/tests/reg-packages.R	2015-08-05 17:45:05.000000000 -0430
-+++ R-3.2.2/tests/reg-packages.R	2015-10-01 02:11:05.484992903 -0430
-@@ -82,7 +82,8 @@
- ## pkgB tests an empty R directory
- dir.create(file.path(pkgPath, "pkgB", "R"), recursive = TRUE,
- 	   showWarnings = FALSE)
-p.lis <- if("Matrix" %in% row.names(installed.packages(.Library)))
-+matrixIsInstalled <- "Matrix" %in% row.names(installed.packages(.Library))
-+p.lis <- if(matrixIsInstalled)
- 	     c("pkgA", "pkgB", "exNSS4") else "exNSS4"
- for(p. in p.lis) {
-     cat("building package", p., "...\n")
-@@ -111,8 +112,8 @@
-   tools::assertError(is.null(pkgA:::nilData))
- }
- 
-if(dir.exists(file.path("myLib", "exNSS4"))) {
-    for(ns in c("pkgB", "pkgA", "Matrix", "exNSS4")) unloadNamespace(ns)
-+if(matrixIsInstalled && dir.exists(file.path("myLib", "exNSS4"))) {
-+    for(ns in c(rev(p.lis), "Matrix")) unloadNamespace(ns)
-     ## Both exNSS4 and Matrix define "atomicVector" *the same*,
-     ## but  'exNSS4'  has it extended - and hence *both* are registered in cache -> "conflicts"
-     requireNamespace("exNSS4", lib= "myLib")
--- a/pkgs/applications/video/handbrake/default.nix
+++ b/pkgs/applications/video/handbrake/default.nix
@ -22,7 +22,7 @@
  mp4v2, mpeg2dec, x264, libmkv,
  fontconfig, freetype,
  glib, gtk, webkitgtk, intltool, libnotify,
-  gst_all_1, dbus_glib, udev,
+  gst_all_1, dbus_glib, udev, libgudev,
  useGtk ? true,
  useWebKitGtk ? false # This prevents ghb from starting in my tests
 }:
@ -37,6 +37,7 @@ stdenv.mkDerivation rec {
  buildInputsX = stdenv.lib.optionals useGtk [
    glib gtk intltool libnotify
    gst_all_1.gstreamer gst_all_1.gst-plugins-base dbus_glib udev
+    libgudev
  ] ++ stdenv.lib.optionals useWebKitGtk [ webkitgtk ];

  # Did not test compiling with it
--- a/pkgs/applications/video/pitivi/default.nix
+++ b/pkgs/applications/video/pitivi/default.nix
@ -1,16 +1,16 @@
 { stdenv, fetchurl, pkgconfig, intltool, itstool, makeWrapper
-, python3Packages, gst, clutter-gtk, hicolor_icon_theme
+, python3Packages, gst, gtk3, hicolor_icon_theme
 , gobjectIntrospection, librsvg, gnome3, libnotify
 }:

 let
-  version = "0.94";
+  version = "0.95";
 in stdenv.mkDerivation rec {
  name = "pitivi-${version}";

  src = fetchurl {
    url = "mirror://gnome/sources/pitivi/${version}/${name}.tar.xz";
-    sha256 = "1v7s0qsibwykkmknspjhpdrj80s987pvbl01kh34k4aspi1hcapm";
+    sha256 = "04ykw619aikhxk5wj7z44pvwl52053d1kamcxpscw0ixrh5j45az";
  };

  meta = with stdenv.lib; {
@ -29,15 +29,15 @@ in stdenv.mkDerivation rec {
  nativeBuildInputs = [ pkgconfig intltool itstool makeWrapper ];

  buildInputs = [
-    gobjectIntrospection clutter-gtk librsvg gnome3.gnome_desktop
+    gobjectIntrospection gtk3 librsvg gnome3.gnome_desktop
    gnome3.defaultIconTheme
    gnome3.gsettings_desktop_schemas libnotify
  ] ++ (with gst; [
    gstreamer gst-editing-services
    gst-plugins-base gst-plugins-good
-    gst-plugins-bad gst-plugins-ugly gst-libav
+    gst-plugins-bad gst-plugins-ugly gst-libav gst-validate
  ]) ++ (with python3Packages; [
-    python pygobject3 gst-python pyxdg numpy pycairo sqlite3
+    python pygobject3 gst-python pyxdg numpy pycairo sqlite3 matplotlib
  ]);

  preFixup = ''
--- a/pkgs/applications/virtualization/xen/4.5.2.nix
+++ b/pkgs/applications/virtualization/xen/4.5.2.nix
@ -1,14 +1,14 @@
 { callPackage, fetchurl, fetchgit, ... } @ args:

 let
-  # Xen 4.5.1
-  xenConfig = {
-    name = "xen-4.5.1";
-    version = "4.5.1";
+  # Xen 4.5.2
+  xenConfig = rec {
+    version = "4.5.2";
+    name = "xen-${version}";

    src = fetchurl {
-      url = "http://bits.xensource.com/oss-xen/release/4.5.1/xen-4.5.1.tar.gz";
-      sha256 = "0w8kbqy7zixacrpbk3yj51xx7b3f6l8ghsg3551w8ym6zka13336";
+      url = "http://bits.xensource.com/oss-xen/release/${version}/${name}.tar.gz";
+      sha256 = "1s7702zrxpsmx4vqvll4x2s762cfdiss4vgpx5s4jj7a9sn5v7jc";
    };

    # Sources needed to build the xen tools and tools/firmware.
@ -23,25 +23,25 @@ let
        }
        { git = { name = "ovmf";
                  url = git://xenbits.xen.org/ovmf.git;
-                  rev = "447d264115c476142f884af0be287622cd244423";
-                  sha256 = "7086f882495a8be1497d881074e8f1005dc283a5e1686aec06c1913c76a6319b";
+                  rev = "cb9a7ebabcd6b8a49dc0854b2f9592d732b5afbd";
+                  sha256 = "1ncb8dpqzaj3s8am44jvclhby40hwczljz0a1gd282h9yr4k4sk2";
                };
        }
      ];

    toolsGits =
-      [ # tag qemu-xen-4.5.1
+      [ # tag qemu-xen-4.5.2
        { git = { name = "qemu-xen";
                  url = git://xenbits.xen.org/qemu-upstream-4.5-testing.git;
-                  rev = "d9552b0af21c27535cd3c8549bb31d26bbecd506";
-                  sha256 = "15dbz8j26wl4vs5jijhccwgd8c6wkmpj4mz899fa7i1bbh8yysfy";
+                  rev = "e5a1bb22cfb307db909dbd3404c48e5bbeb9e66d";
+                  sha256 = "1qflb3j8qcvipavybqhi0ql7m2bx51lhzgmf7pdbls8minpvdzg2";
                };
        }
-        # tag xen-4.5.1
+        # tag xen-4.5.2
        { git = { name = "qemu-xen-traditional";
                  url = git://xenbits.xen.org/qemu-xen-4.5-testing.git;
-                  rev = "afaa35b4bc975b2b89ad44c481d0d7623e3d1c49";
-                  sha256 = "906b31cf32b52d29e521abaa76d641123bdf24f33fa53c6f109b6d7834e514be";
+                  rev = "dfe880e8d5fdc863ce6bbcdcaebaf918f8689cc0";
+                  sha256 = "14fxdsnkq729z5glkifdpz26idmn7fl38w1v97xj8cf6ifvk76cz";
                };
        }
        { git = { name = "xen-libhvm";
@ -64,4 +64,3 @@ let
  };

 in callPackage ./generic.nix (args // { xenConfig=xenConfig; })
-
--- a/pkgs/applications/window-managers/fvwm/default.nix
+++ b/pkgs/applications/window-managers/fvwm/default.nix
@ -1,8 +1,12 @@
-{ stdenv, fetchurl, pkgconfig
+{ gestures ? false
+, stdenv, fetchurl, pkgconfig
 , cairo, fontconfig, freetype, libXft, libXcursor, libXinerama
 , libXpm, librsvg, libpng, fribidi, perl
+, libstroke ? null
 }:

+assert gestures -> libstroke != null;
+
 stdenv.mkDerivation rec {
  name = "fvwm-2.6.5";

@ -15,7 +19,7 @@ stdenv.mkDerivation rec {
    pkgconfig cairo fontconfig freetype
    libXft libXcursor libXinerama libXpm
    librsvg libpng fribidi perl
-  ];
+  ] ++ stdenv.lib.optional gestures libstroke;

  meta = {
    homepage = "http://fvwm.org";
--- a/pkgs/applications/window-managers/i3/blocks.nix
+++ b/pkgs/applications/window-managers/i3/blocks.nix
@ -0,0 +1,22 @@
+{ fetchurl, stdenv }:
+
+stdenv.mkDerivation rec {
+  name = "i3blocks-${version}";
+  version = "1.4";
+
+  src = fetchurl {
+    url = "https://github.com/vivien/i3blocks/releases/download/${version}/${name}.tar.gz";
+    sha256 = "c64720057e22cc7cac5e8fcd58fd37e75be3a7d5a3cb8995841a7f18d30c0536";
+  };
+
+  makeFlags = "all";
+  installFlags = "PREFIX=\${out} VERSION=${version}";
+
+  meta = with stdenv.lib; {
+    description = "A flexible scheduler for your i3bar blocks.";
+    homepage = https://github.com/vivien/i3blocks;
+    license = licenses.gpl3;
+    maintainers = [ "MindTooth" ];
+    platforms = platforms.all;
+  };
+}
--- a/pkgs/build-support/build-fhs-userenv/chroot-user.rb
+++ b/pkgs/build-support/build-fhs-userenv/chroot-user.rb
@ -140,10 +140,10 @@ if $cpid == 0
  link_swdir.call swdir, Pathname.new('')

  # New environment
-  ENV.replace(Hash[ envvars.map { |x| [x, ENV[x]] } ])
+  new_env = Hash[ envvars.map { |x| [x, ENV[x]] } ]

  # Finally, exec!
-  exec *execp
+  exec(new_env, *execp, close_others: true, unsetenv_others: true)
 end

 # Wait for a child. If we catch a signal, resend it to child and continue
--- a/pkgs/build-support/fetchurl/builder.sh
+++ b/pkgs/build-support/fetchurl/builder.sh
@ -89,10 +89,6 @@ for url in $urls; do
        if test -z "${!varName}"; then
            echo "warning: unknown mirror:// site \`$site'"
        else
-            # Assume that SourceForge/GNU/kernel mirrors have better
-            # bandwidth than nixos.org.
-            preferHashedMirrors=
-
            mirrors=${!varName}

            # Allow command-line override by setting NIX_MIRRORS_$site.
--- a/pkgs/build-support/make-desktopitem/default.nix
+++ b/pkgs/build-support/make-desktopitem/default.nix
@ -9,6 +9,7 @@
 , genericName
 , mimeType ? ""
 , categories ? "Application;Other;"
+, startupNotify ? null
 }:

 stdenv.mkDerivation {
@ -26,6 +27,8 @@ stdenv.mkDerivation {
    GenericName=${genericName}
    MimeType=${mimeType}
    Categories=${categories}
-    EOF
+    ${if startupNotify == null then ''EOF'' else ''
+    StartupNotify=${startupNotify}
+    EOF''}
  '';
 }
--- a/pkgs/data/fonts/droid/default.nix
+++ b/pkgs/data/fonts/droid/default.nix
@ -0,0 +1,60 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "font-droid-${version}";
+  version = "2015-12-09";
+  at = "2776afefa9e0829076cd15fdc41e7950e2ffab82";
+
+  srcs = [
+    (fetchurl {
+      url = "https://github.com/google/fonts/raw/${at}/apache/droidsans/DroidSans.ttf";
+      sha256 = "1yml18dm86rrkihb2zz0ng8b1j2bb14hxc1d3hp0998vsr9s1w4h";
+    })
+    (fetchurl {
+      url = "https://github.com/google/fonts/raw/${at}/apache/droidsans/DroidSans-Bold.ttf";
+      sha256 = "1z61hz92d3l1pawmbc6iwi689v8rr0xlkx59pl89m1g9aampdrmh";
+    })
+    (fetchurl {
+      url = "https://github.com/google/fonts/raw/${at}/apache/droidsansmono/DroidSansMono.ttf";
+      sha256 = "0rzspxg457q4f4cp2wz93py13lbnqbhf12q4mzgy6j30njnjwl9h";
+    })
+    (fetchurl {
+      url = "https://github.com/google/fonts/raw/${at}/apache/droidserif/DroidSerif.ttf";
+      sha256 = "1y7jzi7dz8j1yp8dxbmbvd6dpsck2grk3q1kd5rl7f31vlq5prj1";
+    })
+    (fetchurl {
+      url = "https://github.com/google/fonts/raw/${at}/apache/droidserif/DroidSerif-Bold.ttf";
+      sha256 = "1c61b423sn5nnr2966jdzq6fy8pw4kg79cr3nbby83jsly389f9b";
+    })
+    (fetchurl {
+      url = "https://github.com/google/fonts/raw/${at}/apache/droidserif/DroidSerif-Italic.ttf";
+      sha256 = "1bvrilgi0s72hiiv32hlxnzazslh3rbz8wgmsln0i9mnk7jr9bs0";
+    })
+    (fetchurl {
+      url = "https://github.com/google/fonts/raw/${at}/apache/droidserif/DroidSerif-BoldItalic.ttf";
+      sha256 = "052vlkmhy9c5nyk4byvhzya3y57fb09lqxd6spar6adf9ajbylgi";
+    })
+  ];
+
+  phases = [ "unpackPhase" "installPhase" ];
+
+  sourceRoot = "./";
+
+  unpackCmd = ''
+    ttfName=$(basename $(stripHash $curSrc; echo $strippedName))
+    cp $curSrc ./$ttfName
+  '';
+
+  installPhase = ''
+    mkdir -p $out/share/fonts/droid
+    cp *.ttf $out/share/fonts/droid
+  '';
+
+  meta = {
+    description = "Droid Family fonts by Google Android";
+    homepage = [ https://github.com/google/fonts ];
+    license = stdenv.lib.licenses.asl20;
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [];
+  };
+}
--- a/pkgs/desktops/gnome-3/3.18/apps/gnome-music/default.nix
+++ b/pkgs/desktops/gnome-3/3.18/apps/gnome-music/default.nix
@ -10,10 +10,10 @@ stdenv.mkDerivation rec {

  buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.libmediaart
                  gdk_pixbuf gnome3.defaultIconTheme librsvg python3
-                  gnome3.grilo gnome3.grilo-plugins libxml2 python3Packages.pygobject3 libnotify
-                  python3Packages.pycairo python3Packages.dbus gnome3.totem-pl-parser
-                  gst_all_1.gstreamer gst_all_1.gst-plugins-base wrapGAppsHook
-                  gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad
+                  gnome3.grilo gnome3.grilo-plugins gnome3.totem-pl-parser libxml2 libnotify
+                  python3Packages.pycairo python3Packages.dbus python3Packages.requests2
+                  python3Packages.pygobject3 gst_all_1.gstreamer gst_all_1.gst-plugins-base
+                  gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad wrapGAppsHook
                  gnome3.gsettings_desktop_schemas makeWrapper tracker ];

  wrapPrefixVariables = [ "PYTHONPATH" ];
--- a/pkgs/desktops/plasma-5.4/kscreen.nix
+++ b/pkgs/desktops/plasma-5.4/kscreen.nix
@ -13,6 +13,9 @@ plasmaPackage {
    kconfig kconfigwidgets kdbusaddons kwidgetsaddons kxmlgui
  ];
  propagatedBuildInputs = [ kglobalaccel ki18n libkscreen qtdeclarative ];
+  propagatedUserEnvPkgs = [
+    libkscreen  # D-Bus service
+  ];
  postInstall = ''
    wrapQtProgram "$out/bin/kscreen-console"
  '';
--- a/pkgs/desktops/plasma-5.5/breeze-gtk.nix
+++ b/pkgs/desktops/plasma-5.5/breeze-gtk.nix
@ -0,0 +1,8 @@
+{ plasmaPackage
+, extra-cmake-modules
+}:
+
+plasmaPackage {
+  name = "breeze-gtk";
+  nativeBuildInputs = [ extra-cmake-modules ];
+}
--- a/pkgs/desktops/plasma-5.5/default.nix
+++ b/pkgs/desktops/plasma-5.5/default.nix
@ -44,11 +44,12 @@ let

  addPackages = self: with self; {
    bluedevil = callPackage ./bluedevil.nix {};
+    breeze-gtk = callPackage ./breeze-gtk.nix {};
    breeze-qt4 = callPackage ./breeze-qt4.nix {};
    breeze-qt5 = callPackage ./breeze-qt5.nix {};
    breeze =
      let version = (builtins.parseDrvName breeze-qt5.name).version;
-      in symlinkJoin "breeze-${version}" [ breeze-qt4 breeze-qt5 ];
+      in symlinkJoin "breeze-${version}" [ breeze-gtk breeze-qt4 breeze-qt5 ];
    kde-cli-tools = callPackage ./kde-cli-tools.nix {};
    kde-gtk-config = callPackage ./kde-gtk-config {};
    kdecoration = callPackage ./kdecoration.nix {};
--- 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/unstable/plasma/5.4.95/"
+RELEASE_URL="http://download.kde.org/stable/plasma/5.5.0/"
 EXTRA_WGET_ARGS='-A *.tar.xz'

 mkdir tmp; cd tmp
--- a/pkgs/desktops/plasma-5.5/kscreen.nix
+++ b/pkgs/desktops/plasma-5.5/kscreen.nix
@ -10,9 +10,21 @@ plasmaPackage {
    makeQtWrapper
  ];
  buildInputs = [
-    kconfig kconfigwidgets kdbusaddons kwidgetsaddons kxmlgui
+    kconfig
+    kconfigwidgets
+    kdbusaddons
+    kwidgetsaddons
+    kxmlgui
+  ];
+  propagatedBuildInputs = [
+    kglobalaccel
+    ki18n
+    libkscreen
+    qtdeclarative
+  ];
+  propagatedUserEnvPkgs = [
+    libkscreen  # D-Bus service
  ];
-  propagatedBuildInputs = [ kglobalaccel ki18n libkscreen qtdeclarative ];
  postInstall = ''
    wrapQtProgram "$out/bin/kscreen-console"
  '';
--- a/pkgs/desktops/plasma-5.5/plasma-desktop/default.nix
+++ b/pkgs/desktops/plasma-5.5/plasma-desktop/default.nix
@ -18,16 +18,46 @@ plasmaPackage rec {
    makeQtWrapper
  ];
  buildInputs = [
-    attica boost fontconfig kcmutils kdbusaddons kded kitemmodels
-    knewstuff knotifications knotifyconfig kwallet libcanberra_kde
-    libXcursor libpulseaudio libXft libxkbfile phonon
-    qtsvg xf86inputevdev xf86inputsynaptics
-    xkeyboard_config xinput
+    attica
+    boost
+    fontconfig
+    kcmutils
+    kdbusaddons
+    kded
+    kitemmodels
+    knewstuff
+    knotifications
+    knotifyconfig
+    kwallet
+    libcanberra_kde
+    libXcursor
+    libpulseaudio
+    libXft
+    libxkbfile
+    phonon
+    qtsvg
+    xf86inputevdev
+    xf86inputsynaptics
+    xkeyboard_config
+    xinput
  ];
  propagatedBuildInputs = [
-    baloo kactivities kauth kdeclarative kdelibs4support kemoticons
-    kglobalaccel ki18n kpeople krunner kwin plasma-framework
-    plasma-workspace qtdeclarative qtquick1 qtquickcontrols
+    baloo
+    kactivities
+    kauth
+    kdeclarative
+    kdelibs4support
+    kemoticons
+    kglobalaccel
+    ki18n
+    kpeople
+    krunner
+    kwin
+    plasma-framework
+    plasma-workspace
+    qtdeclarative
+    qtquick1
+    qtquickcontrols
    qtx11extras
  ];
  # All propagatedBuildInputs should be present in the profile because
--- a/pkgs/desktops/plasma-5.5/plasma-workspace/0001-qt-5.5-QML-import-paths.patch
+++ b/pkgs/desktops/plasma-5.5/plasma-workspace/0001-qt-5.5-QML-import-paths.patch
@ -1,4 +1,4 @@
-From 1b95c8c95fb8ea097bb5236b19962c7feff9f333 Mon Sep 17 00:00:00 2001
+From ec91088ec46358f39a0374b910cd776993c63acf Mon Sep 17 00:00:00 2001
 From: Thomas Tuegel <ttuegel@gmail.com>
 Date: Mon, 19 Oct 2015 18:55:36 -0500
 Subject: [PATCH 1/2] qt-5.5 QML import paths
@ -80,7 +80,7 @@ index a086581..6e1e8be 100755
 Item {
     id: batterymonitor
 diff --git a/applets/lock_logout/contents/ui/lockout.qml b/applets/lock_logout/contents/ui/lockout.qml
-index d32e7b7..828c5fb 100644
+index 80e7e53..0083cf0 100644
 --- a/applets/lock_logout/contents/ui/lockout.qml
 +++ b/applets/lock_logout/contents/ui/lockout.qml
@@ -23,7 +23,7 @@ import org.kde.plasma.plasmoid 2.0
--- a/pkgs/desktops/plasma-5.5/plasma-workspace/0002-startkde-NixOS-patches.patch
+++ b/pkgs/desktops/plasma-5.5/plasma-workspace/0002-startkde-NixOS-patches.patch
@ -1,6 +1,6 @@
-From 8e5cf662d55415a838ce8c53f854202257e9feb4 Mon Sep 17 00:00:00 2001
+From e5c11a5efc4f8e8ba4e89e0172220da921df38c6 Mon Sep 17 00:00:00 2001
 From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Sun, 22 Nov 2015 08:31:42 -0600
+Date: Wed, 9 Dec 2015 13:20:02 -0600
 Subject: [PATCH 2/2] startkde NixOS patches

 ---
@ -8,7 +8,7 @@ Subject: [PATCH 2/2] startkde NixOS patches
 1 file changed, 89 insertions(+), 122 deletions(-)

 diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
-index 41a8975..130578e 100644
+index 37ab5cd..130578e 100644
 --- a/startkde/startkde.cmake
 +++ b/startkde/startkde.cmake
@@ -1,8 +1,31 @@
@ -121,7 +121,7 @@ index 41a8975..130578e 100644
 -    }
 -
 -    oxygenDir=$fontsDir/oxygen
-    prefixDir="@@KDE_INSTALL_FULL_DATADIR@/fonts/oxygen"
+-    prefixDir="@KDE_INSTALL_FULL_DATADIR@/fonts/oxygen"
 -
 -    # if the oxygen dir doesn't exist, create a symlink to be sure that the
 -    # Oxygen font is available to the user
--- a/pkgs/desktops/plasma-5.5/plasma-workspace/default.nix
+++ b/pkgs/desktops/plasma-5.5/plasma-workspace/default.nix
@ -49,7 +49,6 @@ plasmaPackage rec {
    wrapQtProgram "$out/bin/kcheckrunning"
    wrapQtProgram "$out/bin/systemmonitor"
    wrapQtProgram "$out/bin/kstartupconfig5"
-    wrapQtProgram "$out/bin/startplasmacompositor"
    wrapQtProgram "$out/bin/kdostartupconfig5"
    wrapQtProgram "$out/bin/klipper"
    wrapQtProgram "$out/bin/kuiserver5"
@ -57,6 +56,9 @@ plasmaPackage rec {
    wrapQtProgram "$out/bin/plasmashell"

    wrapQtProgram "$out/lib/libexec/drkonqi"
+
+    rm "$out/bin/startplasmacompositor"
    rm "$out/lib/libexec/startplasma"
+    rm -r "$out/share/wayland-sessions"
  '';
 }
--- a/pkgs/desktops/plasma-5.5/srcs.nix
+++ b/pkgs/desktops/plasma-5.5/srcs.nix
@ -3,307 +3,307 @@

 {
  bluedevil = {
-    version = "5.4.95";
+    version = "5.5.0";
    src = fetchurl {
-      url = "${mirror}/unstable/plasma/5.4.95/bluedevil-5.4.95.tar.xz";
-      sha256 = "0ffd6vw3g0psysc4qwac55r9p32rl7jwvmwc468rpp9xvh52lx4p";
-      name = "bluedevil-5.4.95.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.0/bluedevil-5.5.0.tar.xz";
+      sha256 = "0h0i6npmi2llrma4d0k7jaibfjkwvi7qm003i73prza5b2lm9qgk";
+      name = "bluedevil-5.5.0.tar.xz";
    };
  };
  breeze = {
-    version = "5.4.95";
+    version = "5.5.0";
    src = fetchurl {
-      url = "${mirror}/unstable/plasma/5.4.95/breeze-5.4.95.tar.xz";
-      sha256 = "1xvxykmzp6i2qh6zgdwh1hj6pcfll7y3b63ypivnggi96crynxyr";
-      name = "breeze-5.4.95.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.0/breeze-5.5.0.tar.xz";
+      sha256 = "0jaw8ir5vd3ari4hx52mrnl5mrq9njdci8caq37b3k1p4irxba3p";
+      name = "breeze-5.5.0.tar.xz";
    };
  };
  breeze-gtk = {
-    version = "5.4.95";
+    version = "5.5.0.1";
    src = fetchurl {
-      url = "${mirror}/unstable/plasma/5.4.95/breeze-gtk-5.4.95.tar.xz";
-      sha256 = "1f8qfnm6qyxkar0kw0ryls8z19hk14vlkk1zvm19h0i2fhihgnqg";
-      name = "breeze-gtk-5.4.95.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.0/breeze-gtk-5.5.0.1.tar.xz";
+      sha256 = "04jjb81022k7xfzhzmdani057inmly2r7ksc1wvbg5adi7m0xn4n";
+      name = "breeze-gtk-5.5.0.1.tar.xz";
    };
  };
  discover = {
-    version = "5.4.95";
+    version = "5.5.0";
    src = fetchurl {
-      url = "${mirror}/unstable/plasma/5.4.95/discover-5.4.95.tar.xz";
-      sha256 = "1sj2b7sg23ahjix7xnwx3yja1iz8373c3dirgzr0ggwvqb5q5miz";
-      name = "discover-5.4.95.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.0/discover-5.5.0.tar.xz";
+      sha256 = "0ngxdgkr4ikqmi2x8dgbf6xbpvhwqcv79b7ir2jgmcjjl93958f4";
+      name = "discover-5.5.0.tar.xz";
    };
  };
  kde-cli-tools = {
-    version = "5.4.95";
+    version = "5.5.0";
    src = fetchurl {
-      url = "${mirror}/unstable/plasma/5.4.95/kde-cli-tools-5.4.95.tar.xz";
-      sha256 = "0mh0bjjjji00nrsqr3988qh43jj7i4h7z2lpp2h1i0ykjczjmpj3";
-      name = "kde-cli-tools-5.4.95.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.0/kde-cli-tools-5.5.0.tar.xz";
+      sha256 = "0l45hx1w1pyfbsg60lwdma9pgzdffprvrz12rqq6ylnjsz1askwv";
+      name = "kde-cli-tools-5.5.0.tar.xz";
    };
  };
  kdecoration = {
-    version = "5.4.95";
+    version = "5.5.0";
    src = fetchurl {
-      url = "${mirror}/unstable/plasma/5.4.95/kdecoration-5.4.95.tar.xz";
-      sha256 = "1hbdr9nc50438lrrkdij7mdlg8sclaww1ky4rs0c067gnjgqlff3";
-      name = "kdecoration-5.4.95.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.0/kdecoration-5.5.0.tar.xz";
+      sha256 = "1wdwnj3dridk745mgmi9xnyd7dy0n0444nvq1mggn2mj4ca6q9ra";
+      name = "kdecoration-5.5.0.tar.xz";
    };
  };
  kde-gtk-config = {
-    version = "5.4.95";
+    version = "5.5.0";
    src = fetchurl {
-      url = "${mirror}/unstable/plasma/5.4.95/kde-gtk-config-5.4.95.tar.xz";
-      sha256 = "17l9ypm5b4s8580zi2maxlszh890svcrh1jq3czz10izlmhd1zih";
-      name = "kde-gtk-config-5.4.95.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.0/kde-gtk-config-5.5.0.tar.xz";
+      sha256 = "1bi6dr7bv42rn5jf212qrr5bik8xglvaabz5srqwhs2n4z35913a";
+      name = "kde-gtk-config-5.5.0.tar.xz";
    };
  };
  kdeplasma-addons = {
-    version = "5.4.95";
+    version = "5.5.0";
    src = fetchurl {
-      url = "${mirror}/unstable/plasma/5.4.95/kdeplasma-addons-5.4.95.tar.xz";
-      sha256 = "1a3d96pii6ljvr1sv4v1n5zqmpp0iv1la8jd44bj12d2xhrng7zq";
-      name = "kdeplasma-addons-5.4.95.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.0/kdeplasma-addons-5.5.0.tar.xz";
+      sha256 = "1y3w97pbg24d2mzp2x882a43ljn5wqs74q6ry594a6mip2zzvlrz";
+      name = "kdeplasma-addons-5.5.0.tar.xz";
    };
  };
  kgamma5 = {
-    version = "5.4.95";
+    version = "5.5.0";
    src = fetchurl {
-      url = "${mirror}/unstable/plasma/5.4.95/kgamma5-5.4.95.tar.xz";
-      sha256 = "0jpbd4342k8327ibwxwaam99gxc0h4bz3w0xk3chjv8jj2b3znnk";
-      name = "kgamma5-5.4.95.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.0/kgamma5-5.5.0.tar.xz";
+      sha256 = "1i6c0m0dr23z09r1rdfcna168bmnaysqxwxmp55ix3jad9ilfa8f";
+      name = "kgamma5-5.5.0.tar.xz";
    };
  };
  khelpcenter = {
-    version = "5.4.95";
+    version = "5.5.0";
    src = fetchurl {
-      url = "${mirror}/unstable/plasma/5.4.95/khelpcenter-5.4.95.tar.xz";
-      sha256 = "09vrqjysz20pwcrkk2713jin062prz75h6hsc2swhz873ks3krb4";
-      name = "khelpcenter-5.4.95.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.0/khelpcenter-5.5.0.tar.xz";
+      sha256 = "0piwsa446ja6fmkxc8shzxqmbq7hcbydpc4xsc6bsjbzbskz8c09";
+      name = "khelpcenter-5.5.0.tar.xz";
    };
  };
  khotkeys = {
-    version = "5.4.95";
+    version = "5.5.0";
    src = fetchurl {
-      url = "${mirror}/unstable/plasma/5.4.95/khotkeys-5.4.95.tar.xz";
-      sha256 = "1haxxvs6nbva2x4i3ydx01hci2sfldqf9jdapl311hlliv7055bv";
-      name = "khotkeys-5.4.95.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.0/khotkeys-5.5.0.tar.xz";
+      sha256 = "197fhzm1rcm65k8idf0wlzsnfxpimdzg516syjzkwah5smg1qshl";
+      name = "khotkeys-5.5.0.tar.xz";
    };
  };
  kinfocenter = {
-    version = "5.4.95";
+    version = "5.5.0";
    src = fetchurl {
-      url = "${mirror}/unstable/plasma/5.4.95/kinfocenter-5.4.95.tar.xz";
-      sha256 = "1xz7k8xqzhk8y652h1gixi6bkbz041k0b3di0c5a1wpa78pzxwjb";
-      name = "kinfocenter-5.4.95.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.0/kinfocenter-5.5.0.tar.xz";
+      sha256 = "1xr9l8wg20n0fyg5x9rgyhbimgwmlf97cf2v3yi8aff5mx348avy";
+      name = "kinfocenter-5.5.0.tar.xz";
    };
  };
  kmenuedit = {
-    version = "5.4.95";
+    version = "5.5.0";
    src = fetchurl {
-      url = "${mirror}/unstable/plasma/5.4.95/kmenuedit-5.4.95.tar.xz";
-      sha256 = "1p3agzz2zp1jbdd820kql5064my9lzbk3b8yzli0242gc36sjagq";
-      name = "kmenuedit-5.4.95.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.0/kmenuedit-5.5.0.tar.xz";
+      sha256 = "1hbifshppw64zmsybvcnm4sjy14zjq9rg2jxb36blfnvw08i9z4n";
+      name = "kmenuedit-5.5.0.tar.xz";
    };
  };
  kscreen = {
-    version = "5.4.95";
+    version = "5.5.0";
    src = fetchurl {
-      url = "${mirror}/unstable/plasma/5.4.95/kscreen-5.4.95.tar.xz";
-      sha256 = "1viwy2ia681nkw89n796r4irlf0za1fbhspmnsjw52i9c6ccard5";
-      name = "kscreen-5.4.95.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.0/kscreen-5.5.0.tar.xz";
+      sha256 = "0mznp9lb9z65vfqb752iw7scz0hs3if3bmk9nq1i6ns3c520gcx6";
+      name = "kscreen-5.5.0.tar.xz";
    };
  };
  kscreenlocker = {
-    version = "5.4.95";
+    version = "5.5.0";
    src = fetchurl {
-      url = "${mirror}/unstable/plasma/5.4.95/kscreenlocker-5.4.95.tar.xz";
-      sha256 = "08q2d39yfzfx69b6q0qsh3wlcqp6sh80jxaml2m1l8ksn354ldrg";
-      name = "kscreenlocker-5.4.95.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.0/kscreenlocker-5.5.0.tar.xz";
+      sha256 = "1myx3ykcq4p9f04bp2w7anqnr9f6b2rjajhkvxbwa9rvxjhwf3n9";
+      name = "kscreenlocker-5.5.0.tar.xz";
    };
  };
  ksshaskpass = {
-    version = "5.4.95";
+    version = "5.5.0";
    src = fetchurl {
-      url = "${mirror}/unstable/plasma/5.4.95/ksshaskpass-5.4.95.tar.xz";
-      sha256 = "18k4200ji1k6xb6n5x3s76yx3izqaisb3m7q3icycyzxfq7y50b4";
-      name = "ksshaskpass-5.4.95.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.0/ksshaskpass-5.5.0.tar.xz";
+      sha256 = "12m88cvgvsnfvzvpyaji7x4pcb4b2xw977x5w50b73mbznxw9hhh";
+      name = "ksshaskpass-5.5.0.tar.xz";
    };
  };
  ksysguard = {
-    version = "5.4.95";
+    version = "5.5.0";
    src = fetchurl {
-      url = "${mirror}/unstable/plasma/5.4.95/ksysguard-5.4.95.tar.xz";
-      sha256 = "1bjrap38zpvnxgvm6xnzvwjqdnbj6ygmgv2qpyl12nkv5r12rr73";
-      name = "ksysguard-5.4.95.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.0/ksysguard-5.5.0.tar.xz";
+      sha256 = "1paj03yccnym83l5585scn6mhd82xpzz5pqwqc4gz45cfq6ix3bv";
+      name = "ksysguard-5.5.0.tar.xz";
    };
  };
  kwallet-pam = {
-    version = "5.4.95";
+    version = "5.5.0";
    src = fetchurl {
-      url = "${mirror}/unstable/plasma/5.4.95/kwallet-pam-5.4.95.tar.xz";
-      sha256 = "0vvhx582bk8hvfw3r7518g7vw104az31w6hpah7ki8kvfh35nh65";
-      name = "kwallet-pam-5.4.95.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.0/kwallet-pam-5.5.0.tar.xz";
+      sha256 = "084yyrm00i2yaikbl9sqzp2im56zb987cfqxqlrdgkkwf8p4g60g";
+      name = "kwallet-pam-5.5.0.tar.xz";
    };
  };
  kwayland = {
-    version = "5.4.95";
+    version = "5.5.0";
    src = fetchurl {
-      url = "${mirror}/unstable/plasma/5.4.95/kwayland-5.4.95.tar.xz";
-      sha256 = "0w4d2abxkmxgqfg1xg49x04av85lybkr6ymbpirrkfv5wwhgcnqy";
-      name = "kwayland-5.4.95.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.0/kwayland-5.5.0.tar.xz";
+      sha256 = "1dxa3xkqg96jw3gmc2jya3wym910pdzljhcdspk3n88045wn8hs9";
+      name = "kwayland-5.5.0.tar.xz";
    };
  };
  kwayland-integration = {
-    version = "5.4.95";
+    version = "5.5.0";
    src = fetchurl {
-      url = "${mirror}/unstable/plasma/5.4.95/kwayland-integration-5.4.95.tar.xz";
-      sha256 = "1c52hfshnw9b6qi0xb1vrwg39akd57q7mjc7a5wh3kn873v23jj6";
-      name = "kwayland-integration-5.4.95.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.0/kwayland-integration-5.5.0.tar.xz";
+      sha256 = "0x2kqy89nzswx06n0diskjs14bjcsi0wyydbcx57553r1dkhkhn4";
+      name = "kwayland-integration-5.5.0.tar.xz";
    };
  };
  kwin = {
-    version = "5.4.95";
+    version = "5.5.0";
    src = fetchurl {
-      url = "${mirror}/unstable/plasma/5.4.95/kwin-5.4.95.tar.xz";
-      sha256 = "09dw1vpcf20as8s172vf0mfxq1lrdmwl9m19b1pnpdi71fmmabhy";
-      name = "kwin-5.4.95.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.0/kwin-5.5.0.tar.xz";
+      sha256 = "0f7km0kj1wvm4knpskm3fa82f1nqbv8y8l7mj3nr00zm3rd2zc1l";
+      name = "kwin-5.5.0.tar.xz";
    };
  };
  kwrited = {
-    version = "5.4.95";
+    version = "5.5.0";
    src = fetchurl {
-      url = "${mirror}/unstable/plasma/5.4.95/kwrited-5.4.95.tar.xz";
-      sha256 = "1bzhx8yzwcx78mqkr24pcf9vdh9dbb0rd18pwhyw3xaib2gwiry2";
-      name = "kwrited-5.4.95.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.0/kwrited-5.5.0.tar.xz";
+      sha256 = "1f0zkm0xd3cff947nprcxf45cyk6jkcglv1b7dzn727afm456js8";
+      name = "kwrited-5.5.0.tar.xz";
    };
  };
  libkscreen = {
-    version = "5.4.95";
+    version = "5.5.0";
    src = fetchurl {
-      url = "${mirror}/unstable/plasma/5.4.95/libkscreen-5.4.95.tar.xz";
-      sha256 = "1hpjylkhlfd2h9rc13widyayfgvmwy2dqkc59m1lkf8qgdq6h0sa";
-      name = "libkscreen-5.4.95.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.0/libkscreen-5.5.0.tar.xz";
+      sha256 = "0w03fjcqazx60zzp4sx77fpz53i38hzgn400jqajiwbb6d3mrxw3";
+      name = "libkscreen-5.5.0.tar.xz";
    };
  };
  libksysguard = {
-    version = "5.4.95";
+    version = "5.5.0";
    src = fetchurl {
-      url = "${mirror}/unstable/plasma/5.4.95/libksysguard-5.4.95.tar.xz";
-      sha256 = "0kcxl1pjakk1l27hnc819r0319gpxzrhvq31mzhdfm3lcskjngzi";
-      name = "libksysguard-5.4.95.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.0/libksysguard-5.5.0.tar.xz";
+      sha256 = "1p2nhf9wnw8jf4sinkk6rq7b1daymb16lmhd22lji34ayv1fh9i8";
+      name = "libksysguard-5.5.0.tar.xz";
    };
  };
  milou = {
-    version = "5.4.95";
+    version = "5.5.0";
    src = fetchurl {
-      url = "${mirror}/unstable/plasma/5.4.95/milou-5.4.95.tar.xz";
-      sha256 = "09dz4jjb6adsgwx5qwdzzhwaianlfzs2hwx4qc366yj3hxrch13d";
-      name = "milou-5.4.95.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.0/milou-5.5.0.tar.xz";
+      sha256 = "0xh5fbf6j896dj7krd8fcapn5b10swgg0dmcv3sa8hzkpaw36gfm";
+      name = "milou-5.5.0.tar.xz";
    };
  };
  oxygen = {
-    version = "5.4.95";
+    version = "5.5.0";
    src = fetchurl {
-      url = "${mirror}/unstable/plasma/5.4.95/oxygen-5.4.95.tar.xz";
-      sha256 = "0j94yabkwlgnl2zq0wrcwrh6d9j193mf68b310nz2dfskq5wgvr5";
-      name = "oxygen-5.4.95.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.0/oxygen-5.5.0.tar.xz";
+      sha256 = "12l0m2b5d970grpi5mxd6rl3g8ry50mfr1pjv4ar7jhic6w4zi7x";
+      name = "oxygen-5.5.0.tar.xz";
    };
  };
  plasma-desktop = {
-    version = "5.4.95";
+    version = "5.5.0";
    src = fetchurl {
-      url = "${mirror}/unstable/plasma/5.4.95/plasma-desktop-5.4.95.tar.xz";
-      sha256 = "0rar2ms65jks0knkv9x0gb5f1gp0yhghpskzcpm4m0gj981vbgyp";
-      name = "plasma-desktop-5.4.95.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.0/plasma-desktop-5.5.0.tar.xz";
+      sha256 = "1iak4j4jiigm0sm8f1w2g4w52v2q1rja6s5sy5247j9wyyfc6vw4";
+      name = "plasma-desktop-5.5.0.tar.xz";
    };
  };
  plasma-mediacenter = {
-    version = "5.4.95";
+    version = "5.5.0";
    src = fetchurl {
-      url = "${mirror}/unstable/plasma/5.4.95/plasma-mediacenter-5.4.95.tar.xz";
-      sha256 = "0kzghc8whc87v1ljlxva2k3sx7c2zmvgmp3i2z2lnp7h882a1hak";
-      name = "plasma-mediacenter-5.4.95.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.0/plasma-mediacenter-5.5.0.tar.xz";
+      sha256 = "10jrbs3mrf3vwnw6a0rsipryfr4pd0jp5s89srcqk10p25pimq52";
+      name = "plasma-mediacenter-5.5.0.tar.xz";
    };
  };
  plasma-nm = {
-    version = "5.4.95";
+    version = "5.5.0";
    src = fetchurl {
-      url = "${mirror}/unstable/plasma/5.4.95/plasma-nm-5.4.95.tar.xz";
-      sha256 = "0cwc72lklv97yahh1672bqamlhil12b4wpjy2diqmq75xmajzjds";
-      name = "plasma-nm-5.4.95.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.0/plasma-nm-5.5.0.tar.xz";
+      sha256 = "1clzmrj78g1gs2d6qbnwk3snlz5rhipfrrzm5rsimjqxv111jfd4";
+      name = "plasma-nm-5.5.0.tar.xz";
    };
  };
  plasma-pa = {
-    version = "5.4.95";
+    version = "5.5.0";
    src = fetchurl {
-      url = "${mirror}/unstable/plasma/5.4.95/plasma-pa-5.4.95.tar.xz";
-      sha256 = "0mvxidlzl9nw52sl9r5z180c683iz1a7rr0yh0v88gl30brrqnmw";
-      name = "plasma-pa-5.4.95.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.0/plasma-pa-5.5.0.tar.xz";
+      sha256 = "0yi0snf6xndvwwzlylgyzpv90b9nsknrm3lsk4gvm49q8cvzy8km";
+      name = "plasma-pa-5.5.0.tar.xz";
    };
  };
  plasma-sdk = {
-    version = "5.4.95";
+    version = "5.5.0";
    src = fetchurl {
-      url = "${mirror}/unstable/plasma/5.4.95/plasma-sdk-5.4.95.tar.xz";
-      sha256 = "1lis04qmbca8n2ly2g58xhi3znca14dmib81rfshjqp9rldc2z6k";
-      name = "plasma-sdk-5.4.95.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.0/plasma-sdk-5.5.0.tar.xz";
+      sha256 = "196lna5zbqa8py082c96xl5d3c2l9p4rcnb06fyd91x3z1csq54v";
+      name = "plasma-sdk-5.5.0.tar.xz";
    };
  };
  plasma-workspace = {
-    version = "5.4.95";
+    version = "5.5.0";
    src = fetchurl {
-      url = "${mirror}/unstable/plasma/5.4.95/plasma-workspace-5.4.95.tar.xz";
-      sha256 = "1af2qx5q5pbxyv32fjiwn7cwf5z1xrgj5n22fprsfn1pyjnz4anv";
-      name = "plasma-workspace-5.4.95.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.0/plasma-workspace-5.5.0.tar.xz";
+      sha256 = "013z03s0iy3aw9ks703wif7m6mlxx0vrxj98zvscmiaiasryhf13";
+      name = "plasma-workspace-5.5.0.tar.xz";
    };
  };
  plasma-workspace-wallpapers = {
-    version = "5.4.95";
+    version = "5.5.0";
    src = fetchurl {
-      url = "${mirror}/unstable/plasma/5.4.95/plasma-workspace-wallpapers-5.4.95.tar.xz";
-      sha256 = "0bz0hk6bnm14ppnglwjd82w9gyjm5smv7cpicj25cfwlvz3qjizz";
-      name = "plasma-workspace-wallpapers-5.4.95.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.0/plasma-workspace-wallpapers-5.5.0.tar.xz";
+      sha256 = "0qs547zy8qdmypa6cd60ksian94fykaysnjn7di00gjf2jpfy4dz";
+      name = "plasma-workspace-wallpapers-5.5.0.tar.xz";
    };
  };
  polkit-kde-agent = {
-    version = "1-5.4.95";
+    version = "1-5.5.0";
    src = fetchurl {
-      url = "${mirror}/unstable/plasma/5.4.95/polkit-kde-agent-1-5.4.95.tar.xz";
-      sha256 = "0hc4a36fxn5bw77hldpklj5dwxxx3c67pni9q8d9bpdk52d89wcg";
-      name = "polkit-kde-agent-1-5.4.95.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.0/polkit-kde-agent-1-5.5.0.tar.xz";
+      sha256 = "0ahv82zyj42r1sp4mwp7s8iw44dw9rjx5yqvy7jvdmrvsa9n4f1c";
+      name = "polkit-kde-agent-1-5.5.0.tar.xz";
    };
  };
  powerdevil = {
-    version = "5.4.95";
+    version = "5.5.0";
    src = fetchurl {
-      url = "${mirror}/unstable/plasma/5.4.95/powerdevil-5.4.95.tar.xz";
-      sha256 = "0q3a3d654f3k4qjwq8avk2n0ppila3p8l9kkayd5hcasvvhcihq7";
-      name = "powerdevil-5.4.95.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.0/powerdevil-5.5.0.tar.xz";
+      sha256 = "03gayczhaxql54had50f0jf4vfcckhdxfndv1k33kf16ldyg3w4f";
+      name = "powerdevil-5.5.0.tar.xz";
    };
  };
  sddm-kcm = {
-    version = "5.4.95";
+    version = "5.5.0";
    src = fetchurl {
-      url = "${mirror}/unstable/plasma/5.4.95/sddm-kcm-5.4.95.tar.xz";
-      sha256 = "06i24nqn80j563cw2rsfficyd577j3v7qj83cvn6jwrkhbhc6v45";
-      name = "sddm-kcm-5.4.95.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.0/sddm-kcm-5.5.0.tar.xz";
+      sha256 = "1wvxi4z3bxzj1wgq5n76zlq7d7pydfllx7ghghkdqhl6g4vf6nk0";
+      name = "sddm-kcm-5.5.0.tar.xz";
    };
  };
  systemsettings = {
-    version = "5.4.95";
+    version = "5.5.0";
    src = fetchurl {
-      url = "${mirror}/unstable/plasma/5.4.95/systemsettings-5.4.95.tar.xz";
-      sha256 = "0zr7chjk43mqbb74p4n5n4ny783j8bnmwa4cr86i21bcbkqgp6sq";
-      name = "systemsettings-5.4.95.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.0/systemsettings-5.5.0.tar.xz";
+      sha256 = "1azq8zq214p2lhyq28saw3m07ngi3z4bgx4rx0pflzswqfb6fxr1";
+      name = "systemsettings-5.5.0.tar.xz";
    };
  };
  user-manager = {
-    version = "5.4.95";
+    version = "5.5.0";
    src = fetchurl {
-      url = "${mirror}/unstable/plasma/5.4.95/user-manager-5.4.95.tar.xz";
-      sha256 = "1dbfqb0w3cgkhimw195gwh9cnnx83qacqdc8j5dpvrjybv3ihv3z";
-      name = "user-manager-5.4.95.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.0/user-manager-5.5.0.tar.xz";
+      sha256 = "08v49rwfpq8is829z4zb04qhj49wa2d2c9l2h0di06k1km6vs729";
+      name = "user-manager-5.5.0.tar.xz";
    };
  };
 }
--- a/pkgs/development/compilers/closure/default.nix
+++ b/pkgs/development/compilers/closure/default.nix
@ -26,6 +26,6 @@ stdenv.mkDerivation rec {
    description = "A tool for making JavaScript download and run faster";
    homepage = https://developers.google.com/closure/compiler/;
    license = stdenv.lib.licenses.asl20;
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
  };
 }
--- a/pkgs/development/compilers/cmdstan/default.nix
+++ b/pkgs/development/compilers/cmdstan/default.nix
@ -0,0 +1,40 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "cmdstan-2.9.0";
+
+  src = fetchurl {
+    url = "https://github.com/stan-dev/cmdstan/releases/download/v2.9.0/cmdstan-2.9.0.tar.gz";
+    sha256 = "08bim6nxgam989152hm0ga1rfb33mr71pwsym1nmfmavma68bwm9";
+  };
+
+  buildFlags = "build";
+  enableParallelBuilding = true;
+
+  doCheck = true;
+  checkPhase = "./runCmdStanTests.py src/test/interface";
+
+  installPhase = ''
+    mkdir -p $out/opt $out/bin
+    cp -r . $out/opt/cmdstan
+    ln -s $out/opt/cmdstan/bin/stanc $out/bin/stanc
+    ln -s $out/opt/cmdstan/bin/stansummary $out/bin/stansummary
+    cat > $out/bin/stan <<EOF
+    #!/bin/sh
+    make -C $out/opt/cmdstan "\$(realpath "\$1")"
+    EOF
+    chmod a+x $out/bin/stan
+  '';
+
+  meta = {
+    description = "Command-line interface to Stan";
+    longDescription = ''
+      Stan is a probabilistic programming language implementing full Bayesian
+      statistical inference with MCMC sampling (NUTS, HMC), approximate Bayesian
+      inference with Variational inference (ADVI) and penalized maximum
+      likelihood estimation with Optimization (L-BFGS).
+    '';
+    homepage = http://mc-stan.org/interfaces/cmdstan.html;
+    license = stdenv.lib.licenses.bsd3;
+  };
+}
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@ -57,7 +57,7 @@ assert langGo -> langCC;
 with stdenv.lib;
 with builtins;

-let version = "5.2.0";
+let version = "5.3.0";

    # Whether building a cross-compiler for GNU/Hurd.
    crossGNU = cross != null && cross.config == "i586-pc-gnu";
@ -212,7 +212,7 @@ stdenv.mkDerivation ({

  src = fetchurl {
    url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2";
-    sha256 = "1bccp8a106xwz3wkixn65ngxif112vn90qf95m6lzpgpnl25p0sz";
+    sha256 = "1ny4smkp5bzs3cp8ss7pl6lk8yss0d9m4av1mvdp72r1x695akxq";
  };

  inherit patches;
--- a/pkgs/development/compilers/ghc/7.10.3.nix
+++ b/pkgs/development/compilers/ghc/7.10.3.nix
@ -0,0 +1,70 @@
+{ stdenv, fetchurl, fetchpatch, ghc, perl, gmp, ncurses, libiconv, binutils, coreutils
+, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_45, docbook_xml_dtd_42, hscolour
+}:
+
+let
+
+  buildMK = ''
+    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
+    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include"
+    libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses}/include"
+    libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses}/lib"
+    ${stdenv.lib.optionalString stdenv.isDarwin ''
+      libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-includes="${libiconv}/include"
+      libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-libraries="${libiconv}/lib"
+    ''}
+  '';
+
+in
+
+stdenv.mkDerivation rec {
+  version = "7.10.3";
+  name = "ghc-${version}";
+
+  src = fetchurl {
+    url = "https://downloads.haskell.org/~ghc/${version}/${name}-src.tar.xz";
+    sha256 = "1vsgmic8csczl62ciz51iv8nhrkm72lyhbz7p7id13y2w7fcx46g";
+  };
+
+  buildInputs = [ ghc perl libxml2 libxslt docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42 hscolour ];
+
+  enableParallelBuilding = true;
+
+  preConfigure = ''
+    echo >mk/build.mk "${buildMK}"
+    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"
+  ];
+
+  # 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;
+  };
+
+}
--- a/pkgs/development/compilers/kotlin/default.nix
+++ b/pkgs/development/compilers/kotlin/default.nix
@ -1,12 +1,12 @@
 { stdenv, fetchurl, makeWrapper, jre, unzip, which }:

 stdenv.mkDerivation rec {
-  version = "1.0.0-beta-3594";
+  version = "1.0.0-beta-3595";
  name = "kotlin-${version}";

  src = fetchurl {
    url = "https://github.com/JetBrains/kotlin/releases/download/build-${version}/kotlin-compiler-${version}.zip";
-    sha256 = "a633dc27bc9bc87174835ea47d5be8ec73e0a673bb46c4b9a5a784db95f3c733";
+    sha256 = "1ed750a169a411349852a102d5a9c23aec656acb76d51018a4933741eb846fae";
  };

  propagatedBuildInputs = [ jre which ] ;
--- 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-11-01";
+  shortVersion = "2015-12-09";
  isRelease = false;
  forceBundledLLVM = true;
-  srcRev = "1a2eaffb6";
-  srcSha = "17b8zgz8j5dmz489b4zs2q4igc9x2v4isgqg3i5nzhacghxjqfyy";
+  srcRev = "462ec0576";
+  srcSha = "1mci0hxwnqb24j4k68rgffqk8ccznz2iddfmyhi8wxa094hqgghp";

  /* Rust is bootstrapped from an earlier built version. We need
  to fetch these earlier versions, which vary per platform.
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@ -114,7 +114,24 @@ self: super: {
    preConfigure = "sed -i -e /extra-lib-dirs/d -e /include-dirs/d haskakafka.cabal";
    configureFlags =  "--extra-include-dirs=${pkgs.rdkafka}/include/librdkafka";
    doCheck = false;
-   });
+  });
+
+  # Depends on broken "lss" package.
+  snaplet-lss = dontDistribute super.snaplet-lss;
+
+  # Depends on broken "NewBinary" package.
+  ASN1 = dontDistribute super.ASN1;
+
+  # Depends on broken "frame" package.
+  frame-markdown = dontDistribute super.frame-markdown;
+
+  # Depends on broken "Elm" package.
+  hakyll-elm = dontDistribute super.hakyll-elm;
+  haskelm = dontDistribute super.haskelm;
+  snap-elm = dontDistribute super.snap-elm;
+
+  # Depends on broken "hails" package.
+  hails-bin = dontDistribute super.hails-bin;

  # Foreign dependency name clashes with another Haskell package.
  libarchive-conduit = super.libarchive-conduit.override { archive = pkgs.libarchive; };
@ -921,9 +938,6 @@ self: super: {
    librarySystemDepends = (drv.librarySystemDepends or []) ++ [ pkgs.ncurses ];
  });

-  # https://github.com/Gabriel439/Haskell-Morte-Library/issues/32
-  morte = super.morte.override { alex = self.alex_3_1_4; };
-
  # https://github.com/mainland/language-c-quote/issues/57
  language-c-quote = super.language-c-quote.override { alex = self.alex_3_1_4; };
 }
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
--- a/pkgs/development/haskell-modules/configuration-lts-0.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.0.nix
@ -4018,8 +4018,10 @@ self: super: {
  "haspell" = dontDistribute super."haspell";
  "hasql" = doDistribute super."hasql_0_4_0";
  "hasql-backend" = doDistribute super."hasql-backend_0_2_1";
+  "hasql-pool" = dontDistribute super."hasql-pool";
  "hasql-postgres" = doDistribute super."hasql-postgres_0_7_3";
  "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
+  "hasql-th" = dontDistribute super."hasql-th";
  "hasql-transaction" = dontDistribute super."hasql-transaction";
  "hastache" = doDistribute super."hastache_0_6_0";
  "hastache-aeson" = dontDistribute super."hastache-aeson";
@ -5967,6 +5969,7 @@ self: super: {
  "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";
@ -6147,6 +6150,7 @@ self: super: {
  "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";
@ -7974,6 +7978,7 @@ self: super: {
  "timeconsole" = dontDistribute super."timeconsole";
  "timeit" = dontDistribute super."timeit";
  "timeless" = dontDistribute super."timeless";
+  "timemap" = dontDistribute super."timemap";
  "timeout" = dontDistribute super."timeout";
  "timeout-control" = dontDistribute super."timeout-control";
  "timeout-with-results" = dontDistribute super."timeout-with-results";
@ -8034,6 +8039,7 @@ self: super: {
  "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";
@ -8470,6 +8476,7 @@ self: super: {
  "wai-routes" = dontDistribute super."wai-routes";
  "wai-routing" = dontDistribute super."wai-routing";
  "wai-session" = dontDistribute super."wai-session";
+  "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";
--- a/pkgs/development/haskell-modules/configuration-lts-0.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.1.nix
@ -4017,8 +4017,10 @@ self: super: {
  "haspell" = dontDistribute super."haspell";
  "hasql" = doDistribute super."hasql_0_4_0";
  "hasql-backend" = doDistribute super."hasql-backend_0_2_1";
+  "hasql-pool" = dontDistribute super."hasql-pool";
  "hasql-postgres" = doDistribute super."hasql-postgres_0_7_3";
  "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
+  "hasql-th" = dontDistribute super."hasql-th";
  "hasql-transaction" = dontDistribute super."hasql-transaction";
  "hastache" = doDistribute super."hastache_0_6_0";
  "hastache-aeson" = dontDistribute super."hastache-aeson";
@ -5966,6 +5968,7 @@ self: super: {
  "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";
@ -6146,6 +6149,7 @@ self: super: {
  "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";
@ -7973,6 +7977,7 @@ self: super: {
  "timeconsole" = dontDistribute super."timeconsole";
  "timeit" = dontDistribute super."timeit";
  "timeless" = dontDistribute super."timeless";
+  "timemap" = dontDistribute super."timemap";
  "timeout" = dontDistribute super."timeout";
  "timeout-control" = dontDistribute super."timeout-control";
  "timeout-with-results" = dontDistribute super."timeout-with-results";
@ -8033,6 +8038,7 @@ self: super: {
  "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";
@ -8469,6 +8475,7 @@ self: super: {
  "wai-routes" = dontDistribute super."wai-routes";
  "wai-routing" = dontDistribute super."wai-routing";
  "wai-session" = dontDistribute super."wai-session";
+  "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";
--- a/pkgs/development/haskell-modules/configuration-lts-0.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.2.nix
@ -4017,8 +4017,10 @@ self: super: {
  "haspell" = dontDistribute super."haspell";
  "hasql" = doDistribute super."hasql_0_4_0";
  "hasql-backend" = doDistribute super."hasql-backend_0_2_1";
+  "hasql-pool" = dontDistribute super."hasql-pool";
  "hasql-postgres" = doDistribute super."hasql-postgres_0_7_3";
  "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
+  "hasql-th" = dontDistribute super."hasql-th";
  "hasql-transaction" = dontDistribute super."hasql-transaction";
  "hastache" = doDistribute super."hastache_0_6_0";
  "hastache-aeson" = dontDistribute super."hastache-aeson";
@ -5966,6 +5968,7 @@ self: super: {
  "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";
@ -6146,6 +6149,7 @@ self: super: {
  "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";
@ -7973,6 +7977,7 @@ self: super: {
  "timeconsole" = dontDistribute super."timeconsole";
  "timeit" = dontDistribute super."timeit";
  "timeless" = dontDistribute super."timeless";
+  "timemap" = dontDistribute super."timemap";
  "timeout" = dontDistribute super."timeout";
  "timeout-control" = dontDistribute super."timeout-control";
  "timeout-with-results" = dontDistribute super."timeout-with-results";
@ -8033,6 +8038,7 @@ self: super: {
  "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";
@ -8469,6 +8475,7 @@ self: super: {
  "wai-routes" = dontDistribute super."wai-routes";
  "wai-routing" = dontDistribute super."wai-routing";
  "wai-session" = dontDistribute super."wai-session";
+  "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";
--- a/pkgs/development/haskell-modules/configuration-lts-0.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.3.nix
@ -4017,8 +4017,10 @@ self: super: {
  "haspell" = dontDistribute super."haspell";
  "hasql" = doDistribute super."hasql_0_4_0";
  "hasql-backend" = doDistribute super."hasql-backend_0_2_1";
+  "hasql-pool" = dontDistribute super."hasql-pool";
  "hasql-postgres" = doDistribute super."hasql-postgres_0_7_3";
  "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
+  "hasql-th" = dontDistribute super."hasql-th";
  "hasql-transaction" = dontDistribute super."hasql-transaction";
  "hastache" = doDistribute super."hastache_0_6_0";
  "hastache-aeson" = dontDistribute super."hastache-aeson";
@ -5966,6 +5968,7 @@ self: super: {
  "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";
@ -6146,6 +6149,7 @@ self: super: {
  "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";
@ -7973,6 +7977,7 @@ self: super: {
  "timeconsole" = dontDistribute super."timeconsole";
  "timeit" = dontDistribute super."timeit";
  "timeless" = dontDistribute super."timeless";
+  "timemap" = dontDistribute super."timemap";
  "timeout" = dontDistribute super."timeout";
  "timeout-control" = dontDistribute super."timeout-control";
  "timeout-with-results" = dontDistribute super."timeout-with-results";
@ -8033,6 +8038,7 @@ self: super: {
  "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";
@ -8469,6 +8475,7 @@ self: super: {
  "wai-routes" = dontDistribute super."wai-routes";
  "wai-routing" = dontDistribute super."wai-routing";
  "wai-session" = dontDistribute super."wai-session";
+  "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";
--- a/pkgs/development/haskell-modules/configuration-lts-0.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.4.nix
@ -4014,8 +4014,10 @@ self: super: {
  "haspell" = dontDistribute super."haspell";
  "hasql" = doDistribute super."hasql_0_4_1";
  "hasql-backend" = doDistribute super."hasql-backend_0_2_2";
+  "hasql-pool" = dontDistribute super."hasql-pool";
  "hasql-postgres" = doDistribute super."hasql-postgres_0_7_3";
  "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
+  "hasql-th" = dontDistribute super."hasql-th";
  "hasql-transaction" = dontDistribute super."hasql-transaction";
  "hastache" = doDistribute super."hastache_0_6_0";
  "hastache-aeson" = dontDistribute super."hastache-aeson";
@ -5963,6 +5965,7 @@ self: super: {
  "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";
@ -6143,6 +6146,7 @@ self: super: {
  "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";
@ -7968,6 +7972,7 @@ self: super: {
  "timeconsole" = dontDistribute super."timeconsole";
  "timeit" = dontDistribute super."timeit";
  "timeless" = dontDistribute super."timeless";
+  "timemap" = dontDistribute super."timemap";
  "timeout" = dontDistribute super."timeout";
  "timeout-control" = dontDistribute super."timeout-control";
  "timeout-with-results" = dontDistribute super."timeout-with-results";
@ -8028,6 +8033,7 @@ self: super: {
  "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";
@ -8464,6 +8470,7 @@ self: super: {
  "wai-routes" = dontDistribute super."wai-routes";
  "wai-routing" = dontDistribute super."wai-routing";
  "wai-session" = dontDistribute super."wai-session";
+  "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";
--- a/pkgs/development/haskell-modules/configuration-lts-0.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.5.nix
@ -4014,8 +4014,10 @@ self: super: {
  "haspell" = dontDistribute super."haspell";
  "hasql" = doDistribute super."hasql_0_4_1";
  "hasql-backend" = doDistribute super."hasql-backend_0_2_2";
+  "hasql-pool" = dontDistribute super."hasql-pool";
  "hasql-postgres" = doDistribute super."hasql-postgres_0_7_3";
  "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
+  "hasql-th" = dontDistribute super."hasql-th";
  "hasql-transaction" = dontDistribute super."hasql-transaction";
  "hastache" = doDistribute super."hastache_0_6_0";
  "hastache-aeson" = dontDistribute super."hastache-aeson";
@ -5963,6 +5965,7 @@ self: super: {
  "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";
@ -6143,6 +6146,7 @@ self: super: {
  "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";
@ -7968,6 +7972,7 @@ self: super: {
  "timeconsole" = dontDistribute super."timeconsole";
  "timeit" = dontDistribute super."timeit";
  "timeless" = dontDistribute super."timeless";
+  "timemap" = dontDistribute super."timemap";
  "timeout" = dontDistribute super."timeout";
  "timeout-control" = dontDistribute super."timeout-control";
  "timeout-with-results" = dontDistribute super."timeout-with-results";
@ -8028,6 +8033,7 @@ self: super: {
  "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";
@ -8464,6 +8470,7 @@ self: super: {
  "wai-routes" = dontDistribute super."wai-routes";
  "wai-routing" = dontDistribute super."wai-routing";
  "wai-session" = dontDistribute super."wai-session";
+  "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";
--- a/pkgs/development/haskell-modules/configuration-lts-0.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.6.nix
@ -4011,8 +4011,10 @@ self: super: {
  "haspell" = dontDistribute super."haspell";
  "hasql" = doDistribute super."hasql_0_4_1";
  "hasql-backend" = doDistribute super."hasql-backend_0_2_2";
+  "hasql-pool" = dontDistribute super."hasql-pool";
  "hasql-postgres" = doDistribute super."hasql-postgres_0_7_3";
  "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";
@ -5958,6 +5960,7 @@ self: super: {
  "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";
@ -6138,6 +6141,7 @@ self: super: {
  "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";
@ -7962,6 +7966,7 @@ self: super: {
  "timeconsole" = dontDistribute super."timeconsole";
  "timeit" = dontDistribute super."timeit";
  "timeless" = dontDistribute super."timeless";
+  "timemap" = dontDistribute super."timemap";
  "timeout" = dontDistribute super."timeout";
  "timeout-control" = dontDistribute super."timeout-control";
  "timeout-with-results" = dontDistribute super."timeout-with-results";
@ -8022,6 +8027,7 @@ self: super: {
  "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";
@ -8457,6 +8463,7 @@ self: super: {
  "wai-routes" = dontDistribute super."wai-routes";
  "wai-routing" = dontDistribute super."wai-routing";
  "wai-session" = dontDistribute super."wai-session";
+  "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";
--- a/pkgs/development/haskell-modules/configuration-lts-0.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.7.nix
@ -4011,8 +4011,10 @@ self: super: {
  "haspell" = dontDistribute super."haspell";
  "hasql" = doDistribute super."hasql_0_4_1";
  "hasql-backend" = doDistribute super."hasql-backend_0_2_2";
+  "hasql-pool" = dontDistribute super."hasql-pool";
  "hasql-postgres" = doDistribute super."hasql-postgres_0_7_3";
  "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";
@ -5958,6 +5960,7 @@ self: super: {
  "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";
@ -6138,6 +6141,7 @@ self: super: {
  "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";
@ -7962,6 +7966,7 @@ self: super: {
  "timeconsole" = dontDistribute super."timeconsole";
  "timeit" = dontDistribute super."timeit";
  "timeless" = dontDistribute super."timeless";
+  "timemap" = dontDistribute super."timemap";
  "timeout" = dontDistribute super."timeout";
  "timeout-control" = dontDistribute super."timeout-control";
  "timeout-with-results" = dontDistribute super."timeout-with-results";
@ -8022,6 +8027,7 @@ self: super: {
  "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";
@ -8457,6 +8463,7 @@ self: super: {
  "wai-routes" = dontDistribute super."wai-routes";
  "wai-routing" = dontDistribute super."wai-routing";
  "wai-session" = dontDistribute super."wai-session";
+  "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";
--- a/pkgs/development/haskell-modules/configuration-lts-1.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.0.nix
@ -4001,8 +4001,10 @@ self: super: {
  "haspell" = dontDistribute super."haspell";
  "hasql" = doDistribute super."hasql_0_7_1";
  "hasql-backend" = doDistribute super."hasql-backend_0_4_0";
+  "hasql-pool" = dontDistribute super."hasql-pool";
  "hasql-postgres" = doDistribute super."hasql-postgres_0_10_1";
  "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";
@ -5946,6 +5948,7 @@ self: super: {
  "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";
@ -6126,6 +6129,7 @@ self: super: {
  "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";
@ -7946,6 +7950,7 @@ self: super: {
  "timeconsole" = dontDistribute super."timeconsole";
  "timeit" = dontDistribute super."timeit";
  "timeless" = dontDistribute super."timeless";
+  "timemap" = dontDistribute super."timemap";
  "timeout" = dontDistribute super."timeout";
  "timeout-control" = dontDistribute super."timeout-control";
  "timeout-with-results" = dontDistribute super."timeout-with-results";
@ -8006,6 +8011,7 @@ self: super: {
  "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";
@ -8440,6 +8446,7 @@ self: super: {
  "wai-routes" = dontDistribute super."wai-routes";
  "wai-routing" = dontDistribute super."wai-routing";
  "wai-session" = dontDistribute super."wai-session";
+  "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";
--- a/pkgs/development/haskell-modules/configuration-lts-1.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.1.nix
@ -3996,8 +3996,10 @@ self: super: {
  "haspell" = dontDistribute super."haspell";
  "hasql" = doDistribute super."hasql_0_7_1";
  "hasql-backend" = doDistribute super."hasql-backend_0_4_0";
+  "hasql-pool" = dontDistribute super."hasql-pool";
  "hasql-postgres" = doDistribute super."hasql-postgres_0_10_1";
  "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";
@ -5937,6 +5939,7 @@ self: super: {
  "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";
@ -6117,6 +6120,7 @@ self: super: {
  "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";
@ -7932,6 +7936,7 @@ self: super: {
  "timeconsole" = dontDistribute super."timeconsole";
  "timeit" = dontDistribute super."timeit";
  "timeless" = dontDistribute super."timeless";
+  "timemap" = dontDistribute super."timemap";
  "timeout" = dontDistribute super."timeout";
  "timeout-control" = dontDistribute super."timeout-control";
  "timeout-with-results" = dontDistribute super."timeout-with-results";
@ -7992,6 +7997,7 @@ self: super: {
  "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";
@ -8425,6 +8431,7 @@ self: super: {
  "wai-routes" = dontDistribute super."wai-routes";
  "wai-routing" = dontDistribute super."wai-routing";
  "wai-session" = dontDistribute super."wai-session";
+  "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";
--- a/pkgs/development/haskell-modules/configuration-lts-1.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.10.nix
@ -3983,8 +3983,10 @@ self: super: {
  "haspell" = dontDistribute super."haspell";
  "hasql" = doDistribute super."hasql_0_7_2";
  "hasql-backend" = doDistribute super."hasql-backend_0_4_0";
+  "hasql-pool" = dontDistribute super."hasql-pool";
  "hasql-postgres" = doDistribute super."hasql-postgres_0_10_2";
  "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";
@ -5912,6 +5914,7 @@ self: super: {
  "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";
@ -6090,6 +6093,7 @@ self: super: {
  "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";
@ -7898,6 +7902,7 @@ self: super: {
  "timeconsole" = dontDistribute super."timeconsole";
  "timeit" = dontDistribute super."timeit";
  "timeless" = dontDistribute super."timeless";
+  "timemap" = dontDistribute super."timemap";
  "timeout" = dontDistribute super."timeout";
  "timeout-control" = dontDistribute super."timeout-control";
  "timeout-with-results" = dontDistribute super."timeout-with-results";
@ -7957,6 +7962,7 @@ self: super: {
  "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";
@ -8388,6 +8394,7 @@ self: super: {
  "wai-routes" = dontDistribute super."wai-routes";
  "wai-routing" = dontDistribute super."wai-routing";
  "wai-session" = dontDistribute super."wai-session";
+  "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";
--- a/pkgs/development/haskell-modules/configuration-lts-1.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.11.nix
@ -3982,8 +3982,10 @@ self: super: {
  "haspell" = dontDistribute super."haspell";
  "hasql" = doDistribute super."hasql_0_7_2";
  "hasql-backend" = doDistribute super."hasql-backend_0_4_0";
+  "hasql-pool" = dontDistribute super."hasql-pool";
  "hasql-postgres" = doDistribute super."hasql-postgres_0_10_2";
  "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";
@ -5908,6 +5910,7 @@ self: super: {
  "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";
@ -6086,6 +6089,7 @@ self: super: {
  "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";
@ -7894,6 +7898,7 @@ self: super: {
  "timeconsole" = dontDistribute super."timeconsole";
  "timeit" = dontDistribute super."timeit";
  "timeless" = dontDistribute super."timeless";
+  "timemap" = dontDistribute super."timemap";
  "timeout" = dontDistribute super."timeout";
  "timeout-control" = dontDistribute super."timeout-control";
  "timeout-with-results" = dontDistribute super."timeout-with-results";
@ -7953,6 +7958,7 @@ self: super: {
  "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";
@ -8384,6 +8390,7 @@ self: super: {
  "wai-routes" = dontDistribute super."wai-routes";
  "wai-routing" = dontDistribute super."wai-routing";
  "wai-session" = dontDistribute super."wai-session";
+  "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";
--- a/pkgs/development/haskell-modules/configuration-lts-1.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.12.nix
@ -3982,8 +3982,10 @@ self: super: {
  "haspell" = dontDistribute super."haspell";
  "hasql" = doDistribute super."hasql_0_7_2";
  "hasql-backend" = doDistribute super."hasql-backend_0_4_0";
+  "hasql-pool" = dontDistribute super."hasql-pool";
  "hasql-postgres" = doDistribute super."hasql-postgres_0_10_2";
  "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";
@ -5907,6 +5909,7 @@ self: super: {
  "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";
@ -6085,6 +6088,7 @@ self: super: {
  "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";
@ -7891,6 +7895,7 @@ self: super: {
  "timeconsole" = dontDistribute super."timeconsole";
  "timeit" = dontDistribute super."timeit";
  "timeless" = dontDistribute super."timeless";
+  "timemap" = dontDistribute super."timemap";
  "timeout" = dontDistribute super."timeout";
  "timeout-control" = dontDistribute super."timeout-control";
  "timeout-with-results" = dontDistribute super."timeout-with-results";
@ -7950,6 +7955,7 @@ self: super: {
  "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";
@ -8381,6 +8387,7 @@ self: super: {
  "wai-routes" = dontDistribute super."wai-routes";
  "wai-routing" = dontDistribute super."wai-routing";
  "wai-session" = dontDistribute super."wai-session";
+  "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";
--- a/pkgs/development/haskell-modules/configuration-lts-1.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.13.nix
@ -3980,8 +3980,10 @@ self: super: {
  "haspell" = dontDistribute super."haspell";
  "hasql" = doDistribute super."hasql_0_7_2";
  "hasql-backend" = doDistribute super."hasql-backend_0_4_0";
+  "hasql-pool" = dontDistribute super."hasql-pool";
  "hasql-postgres" = doDistribute super."hasql-postgres_0_10_2";
  "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";
@ -5905,6 +5907,7 @@ self: super: {
  "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";
@ -6083,6 +6086,7 @@ self: super: {
  "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";
@ -7888,6 +7892,7 @@ self: super: {
  "timeconsole" = dontDistribute super."timeconsole";
  "timeit" = dontDistribute super."timeit";
  "timeless" = dontDistribute super."timeless";
+  "timemap" = dontDistribute super."timemap";
  "timeout" = dontDistribute super."timeout";
  "timeout-control" = dontDistribute super."timeout-control";
  "timeout-with-results" = dontDistribute super."timeout-with-results";
@ -7947,6 +7952,7 @@ self: super: {
  "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";
@ -8378,6 +8384,7 @@ self: super: {
  "wai-routes" = dontDistribute super."wai-routes";
  "wai-routing" = dontDistribute super."wai-routing";
  "wai-session" = dontDistribute super."wai-session";
+  "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";
--- a/pkgs/development/haskell-modules/configuration-lts-1.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.14.nix
@ -3977,8 +3977,10 @@ self: super: {
  "haspell" = dontDistribute super."haspell";
  "hasql" = doDistribute super."hasql_0_7_2";
  "hasql-backend" = doDistribute super."hasql-backend_0_4_0";
+  "hasql-pool" = dontDistribute super."hasql-pool";
  "hasql-postgres" = doDistribute super."hasql-postgres_0_10_2";
  "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";
@ -5898,6 +5900,7 @@ self: super: {
  "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";
@ -6076,6 +6079,7 @@ self: super: {
  "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";
@ -7880,6 +7884,7 @@ self: super: {
  "timeconsole" = dontDistribute super."timeconsole";
  "timeit" = dontDistribute super."timeit";
  "timeless" = dontDistribute super."timeless";
+  "timemap" = dontDistribute super."timemap";
  "timeout" = dontDistribute super."timeout";
  "timeout-control" = dontDistribute super."timeout-control";
  "timeout-with-results" = dontDistribute super."timeout-with-results";
@ -7939,6 +7944,7 @@ self: super: {
  "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";
@ -8370,6 +8376,7 @@ self: super: {
  "wai-routes" = dontDistribute super."wai-routes";
  "wai-routing" = dontDistribute super."wai-routing";
  "wai-session" = dontDistribute super."wai-session";
+  "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";
--- a/Show More
+++ b/Show More